Revert latest accidential merge (#75)

Author: zardoy

README.MD

@@ -2,11 +2,9 @@
 
 ## Top Features
 
-> Here React experience hits different!
+### Special Commands
 
-### Special Commands & Actions
-
-See [special commands list](#special-commands-list) ans [code actions list](#contributed-code-actions)
+See [special commands list](#special-commands-list)
 
 ### JSX Outline
 
@@ -64,24 +62,12 @@ const usersList = []
 usersList.map // -> usersList.map((user) => )
 ```
 
-### Case-sensitive Completions
-
-(*disabled by default*)
-
-Filter out completions that start with different casing.
-
 ### Remove Definition From References
 
 (*enabled by default*)
 
 <https://github.com/microsoft/vscode/issues/160637>
 
-### Remove Imports From References
-
-(*enabled by default*)
-
-Removes import statements from references when symbol has usages in the same file. Why? Because if export thing is used in another file, it might be obvious that it is imported, and most probably you are not interested in import statements.
-
 ## Minor Useful Features
 
 ### `enablePlugin` setting
@@ -168,59 +154,6 @@ type A<T extends 'foo' | 'bar' = ''> = ...
 
 Use cases: search excluding comments, search & replace only within strings, find interested JSX attribute node
 
-## Contributed Code Actions
-
-### Swap Keys and Values in Object
-
-> *Note*: Code action displayed **only** when object is fully explicitly selected
-
-Example:
-
-```ts
-const obj = {
-    key1: 'someValue',
-    key2: getSuperUniqueKey()
-}
-// turns into
-const obj = {
-    'someValue': 'key1',
-    [getSuperUniqueKey()]: 'key2'
-}
-```
-
-### Turn Array Into Object
-
-```ts
-const data = [
-    {
-        // test
-        key: 'bar',
-        a: 0
-    },
-    {
-        key: 'baz',
-        // yes
-        b: 1
-    }
-]
-```
-
-After selecting code action, you'll get asked for key to used (here you can use only `key`) and after applying:
-
-```ts
-const a = {
-    'bar': {
-        a: 0
-    },
-    'baz': {
-        // yes
-        b: 1
-    }
-}
-```
-
-(note that for now refactoring removes properties with comments!)
-
 ## Even Even More
 
 Please look at extension settings, as this extension has much more features than described here!

buildTsPlugin.mjs

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

package.json

@@ -135,7 +135,6 @@
         "lodash.throttle": "^4.1.1",
         "mocha": "^10.0.0",
         "modify-json-file": "^1.2.2",
-        "path-browserify": "^1.0.1",
         "pluralize": "github:plurals/pluralize#36f03cd2d573fa6d23e12e1529fa4627e2af74b4",
         "rambda": "^7.2.1",
         "require-from-string": "^2.0.2",

pnpm-lock.yaml

@@ -44,23 +44,14 @@ export type Configuration = {
      * @default true
      *  */
     'removeUselessFunctionProps.enable': boolean
-    /**
-     * @default disable
-     */
-    'removeOrMarkGlobalCompletions.action': 'disable' | 'mark' | 'remove'
     /**
      * Useful for Number types.
      * Patch `toString()`: Removes arg tabstop
      * @default true
      */
     'patchToString.enable': boolean
-    /**
-     * Note: Please use `javascript`/`typescript.preferences.autoImportFileExcludePatterns` when possible, to achieve better performance!
-     * e.g. instead of declaring `@mui/icons-material` here, declare `node_modules/@mui/icons-material` in aforementioned setting.
-     *
-     * And only use this, if auto-imports coming not from physical files (e.g. some modules node imports)
-     * @default []
-     */
+    // TODO achieve perfomace by patching the host
+    /** @default [] */
     'suggestions.banAutoImportPackages': string[]
     /**
      * What insert text to use for keywords (e.g. `return`)
@@ -123,19 +114,6 @@ export type Configuration = {
      * @default true
      *  */
     // 'importUpDefinition.enable': boolean
-    /**
-     * Remove definitions for TS module declarations e.g. *.css
-     * Enable it if your first definition that receives focus is TS module declaration instead of target file itself
-     * Might be really really useful in some cases
-     * @default false
-     */
-    removeModuleFileDefinitions: boolean
-    /**
-     * Enable definitions for strings that appears to be paths (relatively to file)
-     * Also must have and should be enabled if you work with path.join a lot
-     * @default false
-     */
-    enableFileDefinitions: boolean
     /**
      * @default true
      * */
@@ -178,11 +156,6 @@ export type Configuration = {
      * @default true
      */
     'jsxImproveElementsSuggestions.enabled': boolean
-    /**
-     * Recommended to enable to experience less uneeded suggestions unless you are using JSX Elements declared in namespaces
-     * @default false
-     */
-    'jsxImproveElementsSuggestions.filterNamespaces': boolean
     /**
      * @default false
      */
@@ -220,10 +193,6 @@ export type Configuration = {
      * @default true
      */
     removeDefinitionFromReferences: boolean
-    /**
-     * @default true
-     */
-    removeImportsFromReferences: boolean
     /**
      * Small definition improvements by cleaning them out:
      * - remove node_modules definition on React.FC component click
@@ -245,6 +214,7 @@ export type Configuration = {
      * Wether to disable our and builtin method snippets within jsx attributes
      * @default true
      */
+    // TODO add smart setting
     'disableMethodSnippets.jsxAttributes': boolean
     /**
      * Support `@ts-diagnostic-disable` top-level comment for disabling spefici semantic diagnostics
@@ -270,24 +240,10 @@ export type Configuration = {
      */
     patchOutline: boolean
     /**
-     * Exclude covered strings/enum cases in switch in completions
+     * Exclude covered strings/enum cases in switch
      * @default true
      */
     switchExcludeCoveredCases: boolean
-    /**
-     * Make completions case-sensetive (see https://github.com/microsoft/TypeScript/issues/46622)
-     * Might be enabled by default in future. Experimental as for now compares only start of completions.
-     * Might require completion retrigger if was triggered by not quick suggestions.
-     * @default false
-     */
-    caseSensitiveCompletions: boolean
-    /**
-     * Might be useful to enable for a moment. Note, that you can bind shortcuts within VSCode to quickly toggle settings like this
-     * Also experimental and wasnt tested in all cases
-     * Like described in `caseSensitiveCompletions` might require completion retrigger
-     * @default false
-     */
-    disableFuzzyCompletions: boolean
     /**
      * Disable useless highlighting,
      * @default disable
@@ -356,12 +312,5 @@ export type Configuration = {
      * Also affects builtin typescript.suggest.objectLiteralMethodSnippets, even when additional completions disabled
      * @default below
      */
-    // TODO its a bug, change to after & before with fixed behavior
     'objectLiteralCompletions.keepOriginal': 'below' | 'above' | 'remove'
-    /**
-     * Wether to exclude non-JSX components completions in JSX component locations
-     * Requires `completion-symbol` patch
-     * @default false
-     */
-    'experiments.excludeNonJsxCompletions': boolean
 }

src/configurationType.ts

@@ -3,12 +3,12 @@ import { getActiveRegularEditor } from '@zardoy/vscode-utils'
 import { getExtensionSetting } from 'vscode-framework'
 import { TriggerCharacterCommand } from '../typescript/src/ipcTypes'
 
-type SendCommandData<K> = {
+type SendCommandData = {
     position: vscode.Position
     document: vscode.TextDocument
-    inputOptions?: K
+    inputOptions?: any
 }
-export const sendCommand = async <T, K = any>(command: TriggerCharacterCommand, sendCommandDataArg?: SendCommandData<K>): Promise<T | undefined> => {
+export const sendCommand = async <T>(command: TriggerCharacterCommand, sendCommandDataArg?: SendCommandData): Promise<T | undefined> => {
     // plugin id disabled, languageService would not understand the special trigger character
     if (!getExtensionSetting('enablePlugin')) return
 
@@ -19,7 +19,7 @@ export const sendCommand = async <T, K = any>(command: TriggerCharacterCommand,
     const {
         document: { uri },
         position,
-    } = ((): SendCommandData<any> => {
+    } = ((): SendCommandData => {
         if (sendCommandDataArg) return sendCommandDataArg
         const editor = getActiveRegularEditor()!
         return {

src/sendCommand.ts

@@ -1,11 +1,9 @@
 import * as vscode from 'vscode'
-import { getActiveRegularEditor } from '@zardoy/vscode-utils'
-import { getExtensionCommandId, getExtensionSetting, registerExtensionCommand, VSCodeQuickPickItem } from 'vscode-framework'
+import { getActiveRegularEditor, rangeToSelection } from '@zardoy/vscode-utils'
+import { getExtensionCommandId, registerExtensionCommand, VSCodeQuickPickItem } from 'vscode-framework'
 import { showQuickPick } from '@zardoy/vscode-utils/build/quickPick'
 import _ from 'lodash'
 import { compact } from '@zardoy/utils'
-import { defaultJsSupersetLangsWithVue } from '@zardoy/vscode-utils/build/langs'
-import { offsetPosition } from '@zardoy/vscode-utils/build/position'
 import { RequestOptionsTypes, RequestResponseTypes } from '../typescript/src/ipcTypes'
 import { sendCommand } from './sendCommand'
 import { tsRangeToVscode, tsRangeToVscodeSelection } from './util'
@@ -15,15 +13,12 @@ export default () => {
         const editor = getActiveRegularEditor()
         if (!editor) return
         const { selection, document } = editor
-        const response = await sendCommand<
-            RequestResponseTypes['removeFunctionArgumentsTypesInSelection'],
-            RequestOptionsTypes['removeFunctionArgumentsTypesInSelection']
-        >('removeFunctionArgumentsTypesInSelection', {
+        const response = await sendCommand<RequestResponseTypes['removeFunctionArgumentsTypesInSelection']>('removeFunctionArgumentsTypesInSelection', {
             document,
             position: selection.start,
             inputOptions: {
                 endSelection: document.offsetAt(selection.end),
-            },
+            } as RequestOptionsTypes['removeFunctionArgumentsTypesInSelection'],
         })
         if (!response) return
         const { ranges } = response
@@ -220,79 +215,4 @@ export default () => {
     registerExtensionCommand('goToNodeBySyntaxKindWithinSelection', async () => {
         await vscode.commands.executeCommand(getExtensionCommandId('goToNodeBySyntaxKind'), { filterWithSelection: true })
     })
-
-    async function sendTurnIntoArrayRequest<T = RequestResponseTypes['turnArrayIntoObject']>(
-        range: vscode.Range,
-        selectedKeyName?: string,
-        document = vscode.window.activeTextEditor!.document,
-    ) {
-        return sendCommand<T, RequestOptionsTypes['turnArrayIntoObject']>('turnArrayIntoObject', {
-            document,
-            position: range.start,
-            inputOptions: {
-                range: [document.offsetAt(range.start), document.offsetAt(range.end)] as [number, number],
-                selectedKeyName,
-            },
-        })
-    }
-
-    registerExtensionCommand('turnArrayIntoObjectRefactoring' as any, async (_, arg?: RequestResponseTypes['turnArrayIntoObject']) => {
-        if (!arg) return
-        const { keysCount, totalCount, totalObjectCount } = arg
-        const selectedKey: string | false | undefined =
-            // eslint-disable-next-line @typescript-eslint/dot-notation
-            arg['key'] ||
-            (await showQuickPick(
-                Object.entries(keysCount).map(([key, count]) => {
-                    const isAllowed = count === totalObjectCount
-                    return { label: `${isAllowed ? '$(check)' : '$(close)'}${key}`, value: isAllowed ? key : false, description: `${count} hits` }
-                }),
-                {
-                    title: `Selected available key from ${totalObjectCount} objects (${totalCount} elements)`,
-                },
-            ))
-        if (selectedKey === undefined || selectedKey === '') return
-        if (selectedKey === false) {
-            void vscode.window.showWarningMessage("Can't use selected key as its not used in every object")
-            return
-        }
-
-        const editor = vscode.window.activeTextEditor!
-        const edits = await sendTurnIntoArrayRequest<RequestResponseTypes['turnArrayIntoObjectEdit']>(editor.selection, selectedKey)
-        if (!edits) throw new Error('Unknown error. Try debug.')
-        await editor.edit(builder => {
-            for (const { span, newText } of edits) {
-                const start = editor.document.positionAt(span.start)
-                builder.replace(new vscode.Range(start, offsetPosition(editor.document, start, span.length)), newText)
-            }
-        })
-    })
-
-    // its actually a code action, but will be removed from there soon
-    vscode.languages.registerCodeActionsProvider(defaultJsSupersetLangsWithVue, {
-        async provideCodeActions(document, range, context, token) {
-            if (
-                context.triggerKind !== vscode.CodeActionTriggerKind.Invoke ||
-                document !== vscode.window.activeTextEditor?.document ||
-                !getExtensionSetting('enablePlugin')
-            )
-                return
-            const result = await sendTurnIntoArrayRequest(range)
-            if (!result) return
-            const { keysCount, totalCount, totalObjectCount } = result
-            return [
-                {
-                    title: `Turn Array Into Object (${totalCount} elements)`,
-                    command: getExtensionCommandId('turnArrayIntoObjectRefactoring' as any),
-                    arguments: [
-                        {
-                            keysCount,
-                            totalCount,
-                            totalObjectCount,
-                        } satisfies RequestResponseTypes['turnArrayIntoObject'],
-                    ],
-                },
-            ]
-        },
-    })
 }