feat: boost name suggestion after its declaration

Author: zardoy

src/extension.ts

@@ -4,6 +4,7 @@ import { defaultJsSupersetLangs } from '@zardoy/vscode-utils/build/langs'
 import { Settings, extensionCtx, getExtensionSetting, getExtensionSettingId, registerExtensionCommand } from 'vscode-framework'
 import { pickObj } from '@zardoy/utils'
 import { watchExtensionSettings } from '@zardoy/vscode-utils/build/settings'
+import { ConditionalPick } from 'type-fest'
 import webImports from './webImports'
 import { sendCommand } from './sendCommand'
 import { registerEmmet } from './emmet'
@@ -16,7 +17,6 @@ import vueVolarSupport from './vueVolarSupport'
 import moreCompletions from './moreCompletions'
 import { mergeSettingsFromScopes } from './mergeSettings'
 import codeActionProvider from './codeActionProvider'
-import { ConditionalPick } from 'type-fest'
 
 let isActivated = false
 // let erroredStatusBarItem: vscode.StatusBarItem | undefined
@@ -144,12 +144,13 @@ export const activate = async () => {
 const registerDisableOptionalFeaturesCommand = () => {
     registerExtensionCommand('disableAllOptionalFeatures', async () => {
         const config = vscode.workspace.getConfiguration(process.env.IDS_PREFIX, null)
-        const toDisable: [keyof Settings, any][] = []
+        const toDisable: Array<[keyof Settings, any]> = []
         for (const optionalExperience of optionalExperiences) {
             const desiredKey = Array.isArray(optionalExperience) ? optionalExperience[0] : optionalExperience
             const desiredValue = Array.isArray(optionalExperience) ? optionalExperience[1] : false
             if (config.get(desiredKey) !== desiredValue) toDisable.push([desiredKey, desiredValue])
         }
+
         const action = await vscode.window.showInformationMessage(
             `${toDisable.length} features are going to be disabled`,
             { detail: '', modal: true },
@@ -160,20 +161,22 @@ const registerDisableOptionalFeaturesCommand = () => {
         switch (action) {
             case 'Write to settings NOW': {
                 for (const [key, value] of toDisable) {
-                    config.update(key, value, vscode.ConfigurationTarget.Global)
+                    void config.update(key, value, vscode.ConfigurationTarget.Global)
                 }
+
                 break
             }
+
             case 'Copy settings': {
-                vscode.env.clipboard.writeText(JSON.stringify(Object.fromEntries(toDisable), undefined, 4))
+                await vscode.env.clipboard.writeText(JSON.stringify(Object.fromEntries(toDisable), undefined, 4))
                 break
             }
         }
     })
 }
 
 /** Experiences that are enabled out of the box */
-const optionalExperiences: (keyof ConditionalPick<Settings, boolean> | [keyof Settings, any])[] = [
+const optionalExperiences: Array<keyof ConditionalPick<Settings, boolean> | [keyof Settings, any]> = [
     'enableMethodSnippets',
     'removeUselessFunctionProps.enable',
     'patchToString.enable',

typescript/src/completions/boostNameSuggestions.ts

@@ -17,12 +17,37 @@ export default (
     const fileText = sourceFile.getFullText()
     const fileTextBeforePos = fileText.slice(0, position)
     const beforeConstNodeOffset = fileTextBeforePos.match(/(?:const|let) ([\w\d]*)$/i)?.[1]
+    const nodeWithStatements = node => {
+        return node && 'statements' in node && Array.isArray(node.statements) ? node : undefined
+    }
+    const statementsNode = nodeWithStatements(node) || nodeWithStatements(node.parent)
+    // Workaround for current locality bonus & TS 5.1
+    if (statementsNode) {
+        const statements = statementsNode.statements as any[]
+        const prevNode =
+            statementsNode === node
+                ? [...statements].reverse().find((statement: ts.Node) => statement.pos + statement.getLeadingTriviaWidth() < position)
+                : statements[statements.indexOf(node) - 1]
+        if (prevNode && ts.isVariableStatement(prevNode) && prevNode.declarationList.declarations.length === 1) {
+            const { name } = prevNode.declarationList.declarations[0]!
+            if (ts.isIdentifier(name)) {
+                const kind: ts.ScriptElementKind =
+                    prevNode.declarationList.flags & ts.NodeFlags.Const ? ts.ScriptElementKind.constElement : ts.ScriptElementKind.letElement
+                entries = boostOrAddSuggestions(entries, [
+                    {
+                        name: name.text,
+                        kind,
+                    },
+                ])
+            }
+        }
+    }
     /** false - pick all identifiers after cursor
      * node - pick identifiers that within node */
     let filterBlock: undefined | false | ts.Node
     if (beforeConstNodeOffset !== undefined) {
         const node = findChildContainingPosition(ts, sourceFile, position - beforeConstNodeOffset.length - 2)
-        if (!node || !ts.isVariableDeclarationList(node)) return
+        if (!node || !ts.isVariableDeclarationList(node)) return entries
         filterBlock = false
     } else if (ts.isIdentifier(node) && node.parent?.parent) {
         // node > parent1 > parent2
@@ -44,7 +69,7 @@ export default (
         }
     }
 
-    if (filterBlock === undefined) return
+    if (filterBlock === undefined) return entries
     const semanticDiagnostics = languageService.getSemanticDiagnostics(sourceFile.fileName)
 
     const notFoundIdentifiers = semanticDiagnostics