Merge branch 'main' into develop

zardoy · web-flow · commit b997f5c9eda7 · 2022-12-22T16:24:19.000+03:00
diff --git a/typescript/src/completionsAtPosition.ts b/typescript/src/completionsAtPosition.ts
@@ -190,6 +190,17 @@ export const getCompletionsAtPosition = (
         )
     }
 
+    const inKeywordCompletionsResult = inKeywordCompletions(position, node, sourceFile, program, languageService)
+    if (inKeywordCompletionsResult) {
+        prior.entries.push(...inKeywordCompletionsResult.completions)
+        Object.assign(
+            prevCompletionsMap,
+            _.mapValues(inKeywordCompletionsResult.docPerCompletion, value => ({
+                documentationOverride: value,
+            })),
+        )
+    }
+
     if (c('suggestions.keywordsInsertText') === 'space') {
         prior.entries = keywordsSpace(prior.entries, scriptSnapshot, position, exactNode)
     }

Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,17 @@ export const getCompletionsAtPosition = (`
`190`	`190`	`)`
`191`	`191`	`}`
`192`	`192`
	`193`	`+ const inKeywordCompletionsResult = inKeywordCompletions(position, node, sourceFile, program, languageService)`
	`194`	`+ if (inKeywordCompletionsResult) {`
	`195`	`+ prior.entries.push(...inKeywordCompletionsResult.completions)`
	`196`	`+ Object.assign(`
	`197`	`+ prevCompletionsMap,`
	`198`	`+ _.mapValues(inKeywordCompletionsResult.docPerCompletion, value => ({`
	`199`	`+ documentationOverride: value,`
	`200`	`+ })),`
	`201`	`+ )`
	`202`	`+ }`
	`203`	`+`
`193`	`204`	`if (c('suggestions.keywordsInsertText') === 'space') {`
`194`	`205`	`prior.entries = keywordsSpace(prior.entries, scriptSnapshot, position, exactNode)`
`195`	`206`	`}`