fix suggestions for block when typing already (#243)

prisma · Jun 17, 2020 · 48b9476 · 48b9476
1 parent 079d246
commit 48b9476
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/server/src/MessageHandler.ts b/server/src/MessageHandler.ts
@@ -345,9 +345,20 @@ export function handleCompletionRequest(
   const lines = convertDocumentTextToTrimmedLineArray(document)
   const currentLineUntrimmed = getCurrentLine(document, position.line)
 
+  const currentLineTillPosition = currentLineUntrimmed
+    .slice(0, position.character - 1)
+    .trim()
+  const wordsBeforePosition: string[] = currentLineTillPosition.split(/\s+/)
+
+  const symbolBeforePositionIsWhiteSpace =
+    getSymbolBeforePosition(document, position).search(/\s/) !== -1
+
   const foundBlock = getBlockAtPosition(position.line, lines)
   if (!foundBlock) {
-    if (!isFirstInLine(currentLineUntrimmed, position)) {
+    if (
+      wordsBeforePosition.length > 1 ||
+      (wordsBeforePosition.length === 1 && symbolBeforePositionIsWhiteSpace)
+    ) {
       return
     }
     return getSuggestionForBlockTypes(lines)
@@ -363,11 +374,6 @@ export function handleCompletionRequest(
     )
   }
 
-  const currentLineTillPosition = currentLineUntrimmed
-    .slice(0, position.character - 1)
-    .trim()
-  const wordsBeforePosition: string[] = currentLineTillPosition.split(/\s+/)
-
   // Completion was triggered by a triggerCharacter
   if (context.triggerKind === 2) {
     switch (context.triggerCharacter) {
@@ -394,9 +400,6 @@ export function handleCompletionRequest(
     }
   }
 
-  const symbolBeforePositionIsWhiteSpace =
-    getSymbolBeforePosition(document, position).search(/\s/) !== -1
-
   switch (foundBlock.type) {
     case 'model':
       // check if inside attribute