more streaming edge cases

2 files changed, 14 insertions, 11 deletions

diff --git a/extension/src/lang-server/codeLens.ts b/extension/src/lang-server/codeLens.ts
index 1f352797..5b55589c 100644
--- a/extension/src/lang-server/codeLens.ts
+++ b/extension/src/lang-server/codeLens.ts
@@ -6,12 +6,12 @@ class SuggestionsCodeLensProvider implements vscode.CodeLensProvider {
     document: vscode.TextDocument,
     token: vscode.CancellationToken
   ): vscode.CodeLens[] | Thenable<vscode.CodeLens[]> {
-    let suggestions = editorToSuggestions.get(document.uri.toString());
+    const suggestions = editorToSuggestions.get(document.uri.toString());
     if (!suggestions) {
       return [];
     }
 
-    let codeLenses: vscode.CodeLens[] = [];
+    const codeLenses: vscode.CodeLens[] = [];
     for (const suggestion of suggestions) {
       const range = new vscode.Range(
         suggestion.oldRange.start,
@@ -27,12 +27,16 @@ class SuggestionsCodeLensProvider implements vscode.CodeLensProvider {
           title: "Reject ❌",
           command: "continue.rejectSuggestion",
           arguments: [suggestion],
-        }),
-        new vscode.CodeLens(range, {
-          title: "(⌘⇧↩/⌘⇧⌫ to accept/reject all)",
-          command: "",
         })
       );
+      if (codeLenses.length === 2) {
+        codeLenses.push(
+          new vscode.CodeLens(range, {
+            title: "(⌘⇧↩/⌘⇧⌫ to accept/reject all)",
+            command: "",
+          })
+        );
+      }
     }
 
     return codeLenses;
diff --git a/extension/src/suggestions.ts b/extension/src/suggestions.ts
index 209bf8b2..6e5f52ac 100644
--- a/extension/src/suggestions.ts
+++ b/extension/src/suggestions.ts
@@ -316,7 +316,7 @@ export async function showSuggestion(
         (edit) => {
           edit.insert(
             new vscode.Position(range.end.line, 0),
-            suggestion + "\n"
+            suggestion + (suggestion === "" ? "" : "\n")
           );
         },
         { undoStopBefore: false, undoStopAfter: false }
@@ -324,12 +324,11 @@ export async function showSuggestion(
       .then(
         (success) => {
           if (success) {
+            const suggestionLinesLength =
+              suggestion === "" ? 0 : suggestion.split("\n").length;
             let suggestionRange = new vscode.Range(
               new vscode.Position(range.end.line, 0),
-              new vscode.Position(
-                range.end.line + suggestion.split("\n").length,
-                0
-              )
+              new vscode.Position(range.end.line + suggestionLinesLength, 0)
             );
 
             const filename = editor!.document.uri.toString();