feat: now you can quickly figure out how dep was installed by the rem…

…ove dep code action title
zardoy · Apr 14, 2023 · ae20ad2 · ae20ad2
1 parent a5f9d46
commit ae20ad2
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 42 deletions.
diff --git a/src/codeActions.ts b/src/codeActions.ts
@@ -14,6 +14,7 @@ export const registerCodeActions = () => {
         vscode.languages.registerCodeActionsProvider(
             getExtensionSetting('codeActions.enableLanguages').map(language => ({ language, scheme: 'file' })),
             {
+                // eslint-disable-next-line complexity
                 async provideCodeActions(document, range, { diagnostics }) {
                     const problem = diagnostics[0]
                     const hasMissingImport = problem && problem.source === 'ts' && problem.code === 2307
@@ -31,50 +32,56 @@ export const registerCodeActions = () => {
                     if (builtinModules.includes(moduleName) || moduleName.startsWith('./')) return
 
                     const codeActions: vscode.CodeAction[] = []
-                    // TODO check for existence
-                    codeActions.push(
-                        ...(hasMissingImport
-                            ? []
-                            : [
-                                  {
-                                      title: 'Open README to side',
-                                      command: {
-                                          command: getExtensionCommandId('openPackageReadmePreview'),
-                                          // TODO investigate on titles
-                                          title: '',
-                                          arguments: [moduleName],
-                                      },
-                                      kind: vscode.CodeActionKind.Empty,
-                                  },
-                                  {
-                                      title: 'Open Repository',
-                                      command: {
-                                          command: getExtensionCommandId('openPackageRepository'),
-                                          title: '',
-                                          arguments: [moduleName],
-                                      },
-                                      kind: vscode.CodeActionKind.Empty,
-                                  },
-                              ]),
-                        {
-                            title: 'Open on NPM',
-                            command: {
-                                command: getExtensionCommandId('openOnNpm'),
-                                title: '',
-                                arguments: [moduleName],
+                    if (hasMissingImport) {
+                        const { packageJson = {} } = await readPackageJsonWithMetadata({ type: 'closest' }).catch(() => ({}))
+                        let foundType
+                        for (const depType of ['dependencies', 'devDependencies', 'optionalDependencies'])
+                            if (moduleName in packageJson[depType] ?? {}) {
+                                foundType = depType
+                                break
+                            }
+
+                        // TODO-low check for existence
+                        codeActions.push(
+                            {
+                                title: 'Open README to side',
+                                command: {
+                                    command: getExtensionCommandId('openPackageReadmePreview'),
+                                    title: '',
+                                    arguments: [moduleName],
+                                },
+                                kind: vscode.CodeActionKind.Empty,
+                            },
+                            {
+                                title: 'Open Repository',
+                                command: {
+                                    command: getExtensionCommandId('openPackageRepository'),
+                                    title: '',
+                                    arguments: [moduleName],
+                                },
+                                kind: vscode.CodeActionKind.Empty,
                             },
-                            kind: vscode.CodeActionKind.Empty,
-                        },
-                        {
-                            title: 'Remove with PNPM',
-                            command: {
-                                command: getExtensionCommandId('removePackages'),
-                                title: '',
-                                arguments: [[moduleName]],
+                            {
+                                title: 'Open on NPM',
+                                command: {
+                                    command: getExtensionCommandId('openOnNpm'),
+                                    title: '',
+                                    arguments: [moduleName],
+                                },
+                                kind: vscode.CodeActionKind.Empty,
                             },
-                            kind: vscode.CodeActionKind.Empty,
-                        },
-                    )
+                            {
+                                // todo use multiple find up packageJson and disable this code action if not found
+                                title: `Remove ${foundType ? `from ${foundType}` : 'module'}`,
+                                command: {
+                                    command: getExtensionCommandId('removePackages'),
+                                    title: '',
+                                    arguments: [[moduleName]],
+                                },
+                                kind: vscode.CodeActionKind.Empty,
+                            },
+                        )
+                    }
 
                     if (hasMissingImport || hasMissingTypes) {
                         const addModuleFix = (module: string, type: 'dependency' | 'devDependency', isPreferred = true) => {

diff --git a/src/commands-core/packageManager.ts b/src/commands-core/packageManager.ts
@@ -106,6 +106,7 @@ export const packageManagerCommand = async (_inputArg: {
             return msg
         }
 
+        // eslint-disable-next-line default-case
         switch (subcommand) {
             case 'add':
                 msg += 'Installing'
@@ -117,6 +118,7 @@ export const packageManagerCommand = async (_inputArg: {
                 msg += 'Linking'
                 break
         }
+
         msg += packages.length > 4 ? ` ${packages.length} packages` : `: ${packages.join(', ')}`
         if (flags.includes('-D')) msg += ' as dev'
         return msg