Merge pull request #60 from zardoy/develop

Author: zardoy

buildTsPlugin.mjs

@@ -6,7 +6,7 @@ const result = await buildTsPlugin('typescript', undefined, undefined, {
     minify: !process.argv.includes('--watch'),
     metafile: true,
     banner: {
-        js: 'let ts',
+        js: 'let ts, tsFull;',
         // js: 'const log = (...args) => console.log(...args.map(a => JSON.stringify(a)))',
     },
 })

package.json

@@ -62,7 +62,6 @@
         "type-fest": "^2.13.1",
         "typed-jsonfile": "^0.2.1",
         "typescript": "^4.8.3",
-        "typescript-old": "npm:[email protected]",
         "vitest": "^0.15.1",
         "vscode-manifest": "^0.0.4"
     },
@@ -75,7 +74,7 @@
         "@vscode/emmet-helper": "^2.8.4",
         "@vscode/test-electron": "^2.1.5",
         "@zardoy/utils": "^0.0.9",
-        "@zardoy/vscode-utils": "^0.0.41",
+        "@zardoy/vscode-utils": "^0.0.45",
         "chai": "^4.3.6",
         "chokidar": "^3.5.3",
         "chokidar-cli": "^3.0.0",
@@ -93,6 +92,8 @@
         "rambda": "^7.2.1",
         "require-from-string": "^2.0.2",
         "string-dedent": "^3.0.1",
+        "ts-expose-internals": "^4.8.4",
+        "unleashed-typescript": "^1.3.0",
         "vscode-framework": "^0.0.18",
         "vscode-uri": "^3.0.6"
     },

patches/ts-expose-internals+4.8.4.patch

@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-require-imports */
 import * as vscode from 'vscode'
 import { defaultJsSupersetLangs } from '@zardoy/vscode-utils/build/langs'
-import { getActiveRegularEditor } from '@zardoy/vscode-utils'
 import { extensionCtx, getExtensionSettingId } from 'vscode-framework'
 import { pickObj } from '@zardoy/utils'
 import { Configuration } from './configurationType'
@@ -12,6 +11,7 @@ import experimentalPostfixes from './experimentalPostfixes'
 import migrateSettings from './migrateSettings'
 import figIntegration from './figIntegration'
 import apiCommands from './apiCommands'
+import onCompletionAccepted from './onCompletionAccepted'
 
 export const activateTsPlugin = (tsApi: { configurePlugin; onCompletionAccepted }) => {
     let webWaitingForConfigSync = false
@@ -46,38 +46,7 @@ export const activateTsPlugin = (tsApi: { configurePlugin; onCompletionAccepted
     })
     syncConfig()
 
-    tsApi.onCompletionAccepted((item: vscode.CompletionItem & { document: vscode.TextDocument }) => {
-        const enableMethodSnippets = vscode.workspace.getConfiguration(process.env.IDS_PREFIX, item.document).get('enableMethodSnippets')
-        const { documentation = '' } = item
-        const documentationString = documentation instanceof vscode.MarkdownString ? documentation.value : documentation
-        const insertFuncArgs = /<!-- insert-func: (.*)-->/.exec(documentationString)?.[1]
-        console.debug('insertFuncArgs', insertFuncArgs)
-        if (enableMethodSnippets && insertFuncArgs !== undefined) {
-            const editor = getActiveRegularEditor()!
-            const startPos = editor.selection.start
-            const nextSymbol = editor.document.getText(new vscode.Range(startPos, startPos.translate(0, 1)))
-            if (!['(', '.'].includes(nextSymbol)) {
-                const snippet = new vscode.SnippetString('')
-                snippet.appendText('(')
-                const args = insertFuncArgs.split(',')
-                for (let [i, arg] of args.entries()) {
-                    if (!arg) continue
-                    // skip empty, but add tabstops if we explicitly want it!
-                    if (arg === ' ') arg = ''
-                    snippet.appendPlaceholder(arg)
-                    if (i !== args.length - 1) snippet.appendText(', ')
-                }
-
-                snippet.appendText(')')
-                void editor.insertSnippet(snippet, undefined, {
-                    undoStopAfter: false,
-                    undoStopBefore: false,
-                })
-                if (vscode.workspace.getConfiguration('editor.parameterHints').get('enabled'))
-                    void vscode.commands.executeCommand('editor.action.triggerParameterHints')
-            }
-        }
-    })
+    onCompletionAccepted(tsApi)
 
     if (process.env.PLATFORM === 'web') {
         const possiblySyncConfig = async () => {

pnpm-lock.yaml

@@ -0,0 +1,98 @@
+import * as vscode from 'vscode'
+import { getActiveRegularEditor } from '@zardoy/vscode-utils'
+import { watchExtensionSettings } from '@zardoy/vscode-utils/build/settings'
+import { getExtensionSetting, Settings } from 'vscode-framework'
+import { oneOf } from '@zardoy/utils'
+
+export default (tsApi: { onCompletionAccepted }) => {
+    let justAcceptedReturnKeywordSuggestion = false
+
+    tsApi.onCompletionAccepted((item: vscode.CompletionItem & { document: vscode.TextDocument }) => {
+        const enableMethodSnippets = vscode.workspace.getConfiguration(process.env.IDS_PREFIX, item.document).get('enableMethodSnippets')
+        const { insertText, documentation = '', kind } = item
+        if (kind === vscode.CompletionItemKind.Keyword && insertText === 'return ') {
+            justAcceptedReturnKeywordSuggestion = true
+        }
+
+        const documentationString = documentation instanceof vscode.MarkdownString ? documentation.value : documentation
+        const insertFuncArgs = /<!-- insert-func: (.*)-->/.exec(documentationString)?.[1]
+        console.debug('insertFuncArgs', insertFuncArgs)
+        if (enableMethodSnippets && insertFuncArgs !== undefined) {
+            const editor = getActiveRegularEditor()!
+            const startPos = editor.selection.start
+            const nextSymbol = editor.document.getText(new vscode.Range(startPos, startPos.translate(0, 1)))
+            if (!['(', '.'].includes(nextSymbol)) {
+                const snippet = new vscode.SnippetString('')
+                snippet.appendText('(')
+                const args = insertFuncArgs.split(',')
+                for (let [i, arg] of args.entries()) {
+                    if (!arg) continue
+                    // skip empty, but add tabstops if we explicitly want it!
+                    if (arg === ' ') arg = ''
+                    snippet.appendPlaceholder(arg)
+                    if (i !== args.length - 1) snippet.appendText(', ')
+                }
+
+                snippet.appendText(')')
+                void editor.insertSnippet(snippet, undefined, {
+                    undoStopAfter: false,
+                    undoStopBefore: false,
+                })
+                if (vscode.workspace.getConfiguration('editor.parameterHints').get('enabled')) {
+                    void vscode.commands.executeCommand('editor.action.triggerParameterHints')
+                }
+            }
+        }
+    })
+
+    conditionallyRegister(
+        'suggestions.keywordsInsertText',
+        () =>
+            vscode.workspace.onDidChangeTextDocument(({ document, contentChanges, reason }) => {
+                if (!justAcceptedReturnKeywordSuggestion) return
+                if (document !== vscode.window.activeTextEditor?.document) return
+                try {
+                    if (oneOf(reason, vscode.TextDocumentChangeReason.Redo, vscode.TextDocumentChangeReason.Undo)) {
+                        return
+                    }
+
+                    const char = contentChanges[0]?.text
+                    if (char?.length !== 1 || contentChanges.some(({ text }) => text !== char)) {
+                        return
+                    }
+
+                    if (char === ';') {
+                        void vscode.window.activeTextEditor.edit(builder => {
+                            for (const { range } of contentChanges) {
+                                const pos = range.start
+                                builder.delete(new vscode.Range(pos.translate(0, -1), pos))
+                            }
+                        })
+                    }
+                } finally {
+                    justAcceptedReturnKeywordSuggestion = false
+                }
+            }),
+        val => val !== 'none',
+    )
+}
+
+const conditionallyRegister = <T extends keyof Settings>(
+    settingKey: T,
+    registerFn: () => vscode.Disposable,
+    acceptSettingValue: (val: Settings[T]) => boolean = val => !!val,
+) => {
+    let disposable: vscode.Disposable | undefined
+    const changeRegisterState = () => {
+        const registerState = acceptSettingValue(getExtensionSetting(settingKey))
+        if (registerState) {
+            if (!disposable) disposable = registerFn()
+        } else {
+            disposable?.dispose()
+            disposable = undefined
+        }
+    }
+
+    changeRegisterState()
+    watchExtensionSettings([settingKey], changeRegisterState)
+}

src/extension.ts

@@ -6,7 +6,6 @@ const tryToApply: ApplyCodeAction = (ts, sourceFile, pos, range) => {
     const currentNode = findChildContainingPosition(ts, sourceFile, pos)
     if (!currentNode) return
     const closestBlock = findClosestParent(
-        ts,
         currentNode,
         [
             ts.SyntaxKind.IfStatement,

src/onCompletionAccepted.ts

@@ -39,11 +39,30 @@ export default (entries: ts.CompletionEntry[], position: number, sourceFile: ts.
         inferredName = defaultItemName
     }
 
+    // workaround for
+    // https://github.com/microsoft/vscode/blob/4765b898acb38a44f9dd8fa7ed48e833fff6ecc6/extensions/typescript-language-features/src/languageFeatures/completions.ts#L99
+    // (overriding default range)
+    // after []. .fill was appearing above .filter becuase .filter is snippet in insertText, not changing insertText of .fill so vscode method completions calls work as expected
+    const resetRangeKinds = fullText.slice(position - 1, position) === '.' && [
+        ts.ScriptElementKind.constElement,
+        ts.ScriptElementKind.memberFunctionElement,
+        ts.ScriptElementKind.memberVariableElement,
+    ]
+
+    const arrayItemSnippet = c('arrayMethodsSnippets.addArgTabStop') ? `(\${2:${inferredName}})` : inferredName
+    let insertInnerSnippet = `${arrayItemSnippet} => $3`
+    if (c('arrayMethodsSnippets.addOuterTabStop')) insertInnerSnippet = `\${1:${insertInnerSnippet}}`
+
     return entries.map(entry => {
-        if (!arrayMethodsToPatch.includes(entry.name.replace(/^★ /, ''))) return entry
-        const arrayItemSnippet = c('arrayMethodsSnippets.addArgTabStop') ? `(\${2:${inferredName}})` : inferredName
-        let insertInnerSnippet = `${arrayItemSnippet} => $3`
-        if (c('arrayMethodsSnippets.addOuterTabStop')) insertInnerSnippet = `\${1:${insertInnerSnippet}}`
+        if (!arrayMethodsToPatch.includes(entry.name.replace(/^★ /, ''))) {
+            if (resetRangeKinds && resetRangeKinds.includes(entry.kind) && !entry.replacementSpan) {
+                return {
+                    ...entry,
+                    replacementSpan: { start: position, length: 0 },
+                }
+            }
+            return entry
+        }
         return {
             ...entry,
             insertText: `${entry.insertText ?? entry.name}(${insertInnerSnippet})`,

typescript/src/codeActions/toggleBraces.ts

@@ -0,0 +1,53 @@
+export default (entries: ts.CompletionEntry[], scriptSnapshot: ts.IScriptSnapshot, position: number, node) => {
+    const charAhead = scriptSnapshot.getText(position, position + 1)
+    if (charAhead === ' ') return entries
+    const bannedKeywords = [
+        'true',
+        'false',
+        'undefined',
+        'null',
+        'never',
+        'unknown',
+        'any',
+        'symbol',
+        'string',
+        'number',
+        'boolean',
+        'object',
+        'this',
+        'catch',
+        'constructor',
+        'continue',
+        'break',
+        'debugger',
+        'default',
+        'super',
+        'import',
+    ]
+    const bannedKeywordsWhenInType = ['const', 'void', 'import']
+    const inType = isTypeNode(node)
+    return entries.map(entry => {
+        if (entry.kind !== ts.ScriptElementKind.keyword || bannedKeywords.includes(entry.name) || (inType && bannedKeywordsWhenInType.includes(entry.name)))
+            return entry
+        return { ...entry, insertText: `${entry.name} ` }
+    })
+}
+
+const isTypeNode = (node: ts.Node) => {
+    if (ts.isTypeNode(node)) {
+        // built-in types
+        return true
+    }
+
+    if (inTypeReference(node)) return true
+
+    return false
+
+    function inTypeReference(node: ts.Node) {
+        if (ts.isTypeReferenceNode(node)) {
+            return true
+        }
+
+        return node.parent && inTypeReference(node.parent)
+    }
+}