Merge pull request #124 from zardoy/develop

zardoy · web-flow · commit f436958b6a42 · 2023-04-06T12:47:59.000+03:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,11 @@ jobs:
       - run: pnpm lint
       - run: pnpm vscode-utils prepareFrameworkBuild
       - run: pnpm build
+      - run: timeout 60 pnpm test-plugin
+        if: ${{ runner.os != 'Windows' }}
+      # if command with timeout already failed on unix, Windows job will be cancelled
       - run: pnpm test-plugin
+        if: ${{ runner.os == 'Windows' }}
       - uses: GabrielBB/xvfb-action@v1.6
         with:
           run: pnpm integration-test
diff --git a/typescript/src/completions/objectLiteralCompletions.ts b/typescript/src/completions/objectLiteralCompletions.ts
@@ -1,92 +1,85 @@
-import { GetConfig } from '../types'
 import { getFullTypeChecker, isTs5 } from '../utils'
 import { sharedCompletionContext } from './sharedContext'
 
-export default (
-    entries: ts.CompletionEntry[],
-    node: ts.Node,
-    languageService: ts.LanguageService,
-    preferences: ts.UserPreferences,
-    c: GetConfig,
-): ts.CompletionEntry[] | void => {
-    const { position } = sharedCompletionContext
+export default (prior: ts.CompletionInfo): ts.CompletionEntry[] | void => {
+    const { entries, isMemberCompletion } = prior
+    let { position, c, node, languageService, preferences } = sharedCompletionContext
+    if (!node || entries.length === 0 || !isMemberCompletion) return
 
-    if (entries.length > 0 && node) {
-        const enableMoreVariants = c('objectLiteralCompletions.moreVariants')
-        const keepOriginal = c('objectLiteralCompletions.keepOriginal')
-        if (!preferences.includeCompletionsWithObjectLiteralMethodSnippets && !enableMoreVariants) return
-        // plans to make it hihgly configurable! e.g. if user wants to make some subtype leading (e.g. from [] | {})
-        if (ts.isIdentifier(node)) node = node.parent
-        if (ts.isShorthandPropertyAssignment(node)) node = node.parent
-        const nextChar = node.getSourceFile().getFullText()[position]
-        if (!ts.isObjectLiteralExpression(node) || nextChar === ':') return
+    const enableMoreVariants = c('objectLiteralCompletions.moreVariants')
+    const keepOriginal = c('objectLiteralCompletions.keepOriginal')
+    if (!preferences.includeCompletionsWithObjectLiteralMethodSnippets && !enableMoreVariants) return
+    // plans to make it hihgly configurable! e.g. if user wants to make some subtype leading (e.g. from [] | {})
+    if (ts.isIdentifier(node)) node = node.parent
+    if (ts.isShorthandPropertyAssignment(node)) node = node.parent
+    const nextChar = node.getSourceFile().getFullText()[position]
+    if (!ts.isObjectLiteralExpression(node) || nextChar === ':') return
 
-        entries = [...entries]
-        const typeChecker = languageService.getProgram()!.getTypeChecker()!
-        const objType = typeChecker.getContextualType(node)
-        let oldProperties: ts.Symbol[] | undefined
+    const typeChecker = languageService.getProgram()!.getTypeChecker()!
+    const objType = typeChecker.getContextualType(node)
+    let oldProperties: ts.Symbol[] | undefined
+    if (!isTs5()) {
+        if (!objType) return
+        oldProperties = getAllPropertiesOfType(objType, typeChecker)
+    }
+    // eslint-disable-next-line unicorn/no-useless-spread
+    for (const entry of [...entries]) {
+        let type: ts.Type | undefined
         if (!isTs5()) {
-            if (!objType) return
-            oldProperties = getAllPropertiesOfType(objType, typeChecker)
+            const property = oldProperties!.find(property => property.name === entry.name)
+            if (!property) continue
+            type = typeChecker.getTypeOfSymbolAtLocation(property, node)
+        } else if (entry.symbol) {
+            type = typeChecker.getTypeOfSymbol(entry.symbol)
         }
-        for (const entry of entries) {
-            let type: ts.Type | undefined
-            if (!isTs5()) {
-                const property = oldProperties!.find(property => property.name === entry.name)
-                if (!property) continue
-                type = typeChecker.getTypeOfSymbolAtLocation(property, node)
-            } else if (entry.symbol) {
-                type = typeChecker.getTypeOfSymbol(entry.symbol)
-            }
-            if (!type) continue
-            if (isFunctionType(type, typeChecker)) {
-                if (['above', 'remove'].includes(keepOriginal) && preferences.includeCompletionsWithObjectLiteralMethodSnippets) {
-                    const methodEntryIndex = entries.findIndex(e => e.name === entry.name && isObjectLiteralMethodSnippet(e))
-                    const methodEntry = entries[methodEntryIndex]
-                    if (methodEntry) {
-                        entries.splice(methodEntryIndex, 1)
-                        entries.splice(entries.indexOf(entry) + (keepOriginal === 'before' ? 1 : 0), keepOriginal === 'remove' ? 1 : 0, {
-                            ...methodEntry,
-                            // let correctSorting.enable sort it
-                            sortText: entry.sortText,
-                        })
-                    }
+        if (!type) continue
+        if (isFunctionType(type, typeChecker)) {
+            if (['above', 'remove'].includes(keepOriginal) && preferences.includeCompletionsWithObjectLiteralMethodSnippets) {
+                const methodEntryIndex = entries.findIndex(e => e.name === entry.name && isObjectLiteralMethodSnippet(e))
+                const methodEntry = entries[methodEntryIndex]
+                if (methodEntry) {
+                    entries.splice(methodEntryIndex, 1)
+                    entries.splice(entries.indexOf(entry) + (keepOriginal === 'before' ? 1 : 0), keepOriginal === 'remove' ? 1 : 0, {
+                        ...methodEntry,
+                        // let correctSorting.enable sort it
+                        sortText: entry.sortText,
+                    })
                 }
-                continue
-            }
-            if (!enableMoreVariants) continue
-            const getQuotedSnippet = (): [string, string] => {
-                const quote = tsFull.getQuoteFromPreference(tsFull.getQuotePreference(node.getSourceFile() as any, preferences))
-                return [`: ${quote}$1${quote},$0`, `: ${quote}${quote},`]
             }
-            const insertObjectArrayInnerText = c('objectLiteralCompletions.insertNewLine') ? '\n\t$1\n' : '$1'
-            const booleanCompletion = getBooleanCompletion(type, typeChecker)
-            const completingStyleMap = [
-                [getQuotedSnippet, isStringCompletion],
-                [[`: ${booleanCompletion?.[0] ?? ''},`, `: ${booleanCompletion?.[0] ?? ''}`], () => booleanCompletion?.length === 1],
-                [[': ${1|true,false|},$0', `: true/false,`], () => booleanCompletion?.length === 2],
-                [[`: [${insertObjectArrayInnerText}],$0`, `: [],`], isArrayCompletion],
-                [[`: {${insertObjectArrayInnerText}},$0`, `: {},`], isObjectCompletion],
-            ] as const
-            const fallbackSnippet = c('objectLiteralCompletions.fallbackVariant') ? ([': $0,', ': ,'] as const) : undefined
-            const insertSnippetVariant = completingStyleMap.find(([, detector]) => detector(type!, typeChecker))?.[0] ?? fallbackSnippet
-            if (!insertSnippetVariant) continue
-            const [insertSnippetText, insertSnippetPreview] = typeof insertSnippetVariant === 'function' ? insertSnippetVariant() : insertSnippetVariant
-            const insertText = entry.name + insertSnippetText
-            const index = entries.indexOf(entry)
-            entries.splice(index + (keepOriginal === 'before' ? 1 : 0), keepOriginal === 'remove' ? 1 : 0, {
-                ...entry,
-                // todo setting incompatible!!!
-                sortText: entry.sortText,
-                labelDetails: {
-                    detail: insertSnippetPreview,
-                },
-                insertText,
-                isSnippet: true,
-            })
+            continue
         }
-        return entries
+        if (!enableMoreVariants) continue
+        const getQuotedSnippet = (): [string, string] => {
+            const quote = tsFull.getQuoteFromPreference(tsFull.getQuotePreference(node!.getSourceFile() as any, preferences))
+            return [`: ${quote}$1${quote},$0`, `: ${quote}${quote},`]
+        }
+        const insertObjectArrayInnerText = c('objectLiteralCompletions.insertNewLine') ? '\n\t$1\n' : '$1'
+        const booleanCompletion = getBooleanCompletion(type, typeChecker)
+        const completingStyleMap = [
+            [getQuotedSnippet, isStringCompletion],
+            [[`: ${booleanCompletion?.[0] ?? ''},`, `: ${booleanCompletion?.[0] ?? ''}`], () => booleanCompletion?.length === 1],
+            [[': ${1|true,false|},$0', `: true/false,`], () => booleanCompletion?.length === 2],
+            [[`: [${insertObjectArrayInnerText}],$0`, `: [],`], isArrayCompletion],
+            [[`: {${insertObjectArrayInnerText}},$0`, `: {},`], isObjectCompletion],
+        ] as const
+        const fallbackSnippet = c('objectLiteralCompletions.fallbackVariant') ? ([': $0,', ': ,'] as const) : undefined
+        const insertSnippetVariant = completingStyleMap.find(([, detector]) => detector(type!, typeChecker))?.[0] ?? fallbackSnippet
+        if (!insertSnippetVariant) continue
+        const [insertSnippetText, insertSnippetPreview] = typeof insertSnippetVariant === 'function' ? insertSnippetVariant() : insertSnippetVariant
+        const insertText = entry.name + insertSnippetText
+        const index = entries.indexOf(entry)
+        entries.splice(index + (keepOriginal === 'before' ? 1 : 0), keepOriginal === 'remove' ? 1 : 0, {
+            ...entry,
+            // todo setting incompatible!!!
+            sortText: entry.sortText,
+            labelDetails: {
+                detail: insertSnippetPreview,
+            },
+            insertText,
+            isSnippet: true,
+        })
     }
+    return entries
 }
 
 const isObjectLiteralMethodSnippet = (entry: ts.CompletionEntry) => {
diff --git a/typescript/src/completionsAtPosition.ts b/typescript/src/completionsAtPosition.ts
@@ -229,7 +229,7 @@ export const getCompletionsAtPosition = (
     }
 
     if (node) prior.entries = defaultHelpers(prior.entries, node, languageService) ?? prior.entries
-    if (exactNode) prior.entries = objectLiteralCompletions(prior.entries, exactNode, languageService, options ?? {}, c) ?? prior.entries
+    prior.entries = objectLiteralCompletions(prior) ?? prior.entries
     // 90%
     prior.entries = adjustAutoImports(prior.entries)
 
diff --git a/typescript/test/completions.spec.ts b/typescript/test/completions.spec.ts
@@ -534,7 +534,7 @@ test('Additional types suggestions', () => {
     })
 })
 
-test.skip('Object Literal Completions', () => {
+test('Object Literal Completions', () => {
     const [_positivePositions, _negativePositions, numPositions] = fileContentsSpecialPositions(/* ts */ `
     interface Options {
         usedOption
@@ -562,10 +562,15 @@ test.skip('Object Literal Completions', () => {
             /*3*/
         }
     })
+
+    const a = {
+        /*4*/
+    }
     `)
     const { entriesSorted: pos1 } = getCompletionsAtPosition(numPositions[1]!)!
     const { entriesSorted: pos2 } = getCompletionsAtPosition(numPositions[2]!)!
     const { entriesSorted: pos3 } = getCompletionsAtPosition(numPositions[3]!)!
+    const { entriesSorted: pos4 } = getCompletionsAtPosition(numPositions[4]!)!
     // todo resolve sorting problem + add tests with other keepOriginal (it was tested manually)
     for (const entry of [...pos1, ...pos2, ...pos3]) {
         entry.insertText = entry.insertText?.replaceAll('\n', '\\n')
@@ -657,6 +662,7 @@ test.skip('Object Literal Completions', () => {
         "foo: \${1|true,false|},$0",
       ]
     `)
+    expect(pos4.filter(x => x.insertText?.includes(': '))).toEqual([])
 })
 
 test('Extract to type / interface name inference', () => {
diff --git a/typescript/test/other.spec.ts b/typescript/test/other.spec.ts
@@ -1,7 +1,7 @@
+import { createRequire } from 'module'
 import decorateFormatFeatures from '../src/decorateFormatFeatures'
-import { defaultConfigFunc, entrypoint, sharedLanguageService } from './shared'
 import { getNavTreeItems } from '../src/getPatchedNavTree'
-import { createRequire } from 'module'
+import { defaultConfigFunc, entrypoint, sharedLanguageService } from './shared'
 
 const { languageService, languageServiceHost, updateProject, getCurrentFile } = sharedLanguageService
 
@@ -61,7 +61,7 @@ test('Patched navtree (outline)', () => {
         arraysTuplesNumberedItems: false,
     })
     const simplify = (items: ts.NavigationTree[]) => {
-        const newItems: { text: any; childItems? }[] = []
+        const newItems: Array<{ text: any; childItems? }> = []
         for (const { text, childItems } of items) {
             if (text === 'classes') continue
             newItems.push({ text, ...(childItems ? { childItems: simplify(childItems) } : {}) })

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ export const getCompletionsAtPosition = (`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`if (node) prior.entries = defaultHelpers(prior.entries, node, languageService) ?? prior.entries`
`232`		`- if (exactNode) prior.entries = objectLiteralCompletions(prior.entries, exactNode, languageService, options ?? {}, c) ?? prior.entries`
	`232`	`+ prior.entries = objectLiteralCompletions(prior) ?? prior.entries`
`233`	`233`	`// 90%`
`234`	`234`	`prior.entries = adjustAutoImports(prior.entries)`
`235`	`235`