Merge pull request #102 from zardoy/language-settings

Author: zardoy

package.json

@@ -142,6 +142,7 @@
         "@zardoy/utils": "^0.0.9",
         "@zardoy/vscode-utils": "^0.0.47",
         "chai": "^4.3.6",
+        "change-case": "^4.1.2",
         "chokidar": "^3.5.3",
         "chokidar-cli": "^3.0.0",
         "delay": "^5.0.0",

pnpm-lock.yaml

@@ -4,7 +4,6 @@ import { defaultJsSupersetLangs } from '@zardoy/vscode-utils/build/langs'
 import { extensionCtx, getExtensionSetting, getExtensionSettingId } from 'vscode-framework'
 import { pickObj } from '@zardoy/utils'
 import { watchExtensionSettings } from '@zardoy/vscode-utils/build/settings'
-import { Configuration } from './configurationType'
 import webImports from './webImports'
 import { sendCommand } from './sendCommand'
 import { registerEmmet } from './emmet'
@@ -15,6 +14,7 @@ import onCompletionAccepted from './onCompletionAccepted'
 import specialCommands from './specialCommands'
 import vueVolarSupport from './vueVolarSupport'
 import moreCompletions from './moreCompletions'
+import { mergeSettingsFromScopes } from './mergeSettings'
 
 let isActivated = false
 // let erroredStatusBarItem: vscode.StatusBarItem | undefined
@@ -27,7 +27,9 @@ export const activateTsPlugin = (tsApi: { configurePlugin; onCompletionAccepted
     const syncConfig = () => {
         if (!tsApi) return
         console.log('sending configure request for typescript-essential-plugins')
-        const config: any = vscode.workspace.getConfiguration().get(process.env.IDS_PREFIX!)
+        const config: any = { ...vscode.workspace.getConfiguration().get(process.env.IDS_PREFIX!) }
+        // todo implement language-specific settings
+        mergeSettingsFromScopes(config, 'typescript', extensionCtx.extension.packageJSON)
 
         tsApi.configurePlugin('typescript-essential-plugins', config)
 

src/extension.ts

@@ -0,0 +1,42 @@
+import * as vscode from 'vscode'
+import lodash from 'lodash'
+import { getExtensionContributionsPrefix } from 'vscode-framework'
+import { Configuration } from './configurationType'
+
+const settingsToIgnore = [] as Array<keyof Configuration>
+
+export const mergeSettingsFromScopes = (
+    settings: Record<string, any>,
+    language: string,
+    packageJson: { contributes: { configuration: { properties: Record<string, any> } } },
+) => {
+    const {
+        contributes: {
+            configuration: { properties },
+        },
+    } = packageJson
+    for (const [fullKey, item] of Object.entries(properties)) {
+        const key = fullKey.slice(getExtensionContributionsPrefix().length)
+        const isObject = item.type === 'object'
+        if ((!isObject && item.type !== 'array') || settingsToIgnore.includes(key as keyof Configuration)) {
+            continue
+        }
+
+        const value = getConfigValueFromAllScopes(key as keyof Configuration, language, isObject ? 'object' : 'array')
+        lodash.set(settings, key, value)
+    }
+}
+
+const getConfigValueFromAllScopes = <T extends keyof Configuration>(configKey: T, language: string, type: 'array' | 'object'): Configuration[T] => {
+    const values = { ...vscode.workspace.getConfiguration(process.env.IDS_PREFIX, { languageId: language }).inspect<any[]>(configKey)! }
+    const userValueKeys = Object.keys(values).filter(key => key.endsWith('Value') && !key.startsWith('default'))
+    for (const key of userValueKeys) {
+        if (values[key] !== undefined) {
+            continue
+        }
+
+        values[key] = type === 'array' ? [] : {}
+    }
+
+    return type === 'array' ? userValueKeys.flatMap(key => values[key]) : Object.assign({}, ...userValueKeys.map(key => values[key]))
+}

src/mergeSettings.ts

@@ -222,6 +222,8 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,
                                             formatOptions,
                                             diagnostic.start!,
                                             firstFix.symbolName,
+                                            undefined,
+                                            true,
                                         )
                                     if (namespaceImportAction) {
                                         fixes = []

typescript/src/codeFixes.ts

@@ -1,6 +1,7 @@
 import { parseIgnoreSpec, findIndexOfAutoImportSpec } from './adjustAutoImports'
 import { GetConfig } from './types'
 import { getChangesTracker } from './utils'
+import { camelCase } from 'change-case'
 
 export default (
     c: GetConfig,
@@ -11,6 +12,7 @@ export default (
     position: number,
     symbolName: string,
     entryDetailsPrior?: ts.CompletionEntryDetails,
+    skipCreatingImport = false,
 ) => {
     const changeToNamespaceImport = Object.entries(c('autoImport.changeToNamespaceImport')).map(([key, value]) => {
         return [parseIgnoreSpec(key), value] as const
@@ -36,7 +38,7 @@ export default (
     }
 
     const { module } = changeToNamespaceImport[indexOfAutoImportSpec]![0]
-    const { namespace = module, addImport = true, useDefaultImport } = changeToNamespaceImport[indexOfAutoImportSpec]![1]
+    const { namespace = camelCase(module), addImport = true, useDefaultImport } = changeToNamespaceImport[indexOfAutoImportSpec]![1]
     const textChanges = [
         {
             newText: `${namespace}.`,
@@ -47,19 +49,22 @@ export default (
         },
     ] as ts.TextChange[]
     if (!addImport) return { textChanges, description: `Change to '${namespace}.${symbolName}'` }
-    const { factory } = ts
-    const namespaceIdentifier = factory.createIdentifier(namespace)
-    const importDeclaration = factory.createImportDeclaration(
-        /*modifiers*/ undefined,
-        useDefaultImport
-            ? factory.createImportClause(false, namespaceIdentifier, undefined)
-            : factory.createImportClause(false, undefined, factory.createNamespaceImport(namespaceIdentifier)),
-        factory.createStringLiteral(importPath, preferences.quotePreference === 'single'),
-    )
-    const changeTracker = getChangesTracker(formatOptions)
-    // todo respect sorting?
-    changeTracker.insertNodeAtTopOfFile(sourceFile as any, importDeclaration as any, true)
-    const changes = changeTracker.getChanges()
-    const { textChanges: importTextChanges } = changes[0]!
-    return { textChanges: [...importTextChanges, ...textChanges], description: `+ ${importTextChanges[0]!.newText}`, namespace, useDefaultImport }
+    if (!skipCreatingImport) {
+        const { factory } = ts
+        const namespaceIdentifier = factory.createIdentifier(namespace)
+        const importDeclaration = factory.createImportDeclaration(
+            /*modifiers*/ undefined,
+            useDefaultImport
+                ? factory.createImportClause(false, namespaceIdentifier, undefined)
+                : factory.createImportClause(false, undefined, factory.createNamespaceImport(namespaceIdentifier)),
+            factory.createStringLiteral(importPath, preferences.quotePreference === 'single'),
+        )
+        const changeTracker = getChangesTracker(formatOptions)
+        // todo respect sorting?
+        changeTracker.insertNodeAtTopOfFile(sourceFile as any, importDeclaration as any, true)
+        const changes = changeTracker.getChanges()
+        const { textChanges: importTextChanges } = changes[0]!
+        textChanges.unshift(...importTextChanges)
+    }
+    return { textChanges, description: `Add namespace import from '${importPath}'`, namespace, useDefaultImport }
 }

typescript/src/namespaceAutoImports.ts

@@ -21,6 +21,9 @@ const plugin = (context => {
         // todo support vue-specific settings
         const originalLsMethods = { ...typescript.languageService }
 
+        configurationHost.getConfiguration<any>('[vue]').then(_configuration => {
+            console.log('_configuration', _configuration)
+        })
         configurationHost.getConfiguration<any>('tsEssentialPlugins').then(_configuration => {
             // if (typescript.languageService[thisPluginMarker]) return
             const config = patchConfig(_configuration)