fix: rare git integration error

fix: introduce workaround for json no diagnostics microsoft/vscode-languageserver-node#1252

Author: zardoy

src/autoInstall.ts

@@ -130,7 +130,7 @@ export const registerLockfilesWatcher = () => {
                 }).catch(() => null)
             }
 
-            for (const { action, uri } of recentLockfileChanges as any[]) void handleLockfileChangeUI(action, uri)
+            for (const { action, uri } of recentLockfileChanges ?? []) void handleLockfileChangeUI(action, uri)
         })
     })()
 }

src/commands-core/npmScripts.ts

@@ -1,5 +1,5 @@
 import vscode from 'vscode'
-import { readPackageJsonWithMetadata } from './packageJson'
+import { readPackageJsonWithMetadata, showPackageJson } from './packageJson'
 
 type PromiseType<T> = T extends Promise<infer U> ? U : never
 
@@ -22,7 +22,7 @@ export const launchNpmTask = async (getNpmScript: (params: PromiseType<ReturnTyp
         // TODO command title
         // TODO change to define `start` script
         const action = await vscode.window.showErrorMessage('No `scripts` defined in package.json', 'Open package.json')
-        // if (action) vscode.workspace.openTextDocument(vscode.Uri.file(join(workspacePath, 'package.json')))
+        if (action) await showPackageJson(workspaceUri)
 
         return
     }

src/commands-core/packageJson.ts

@@ -2,7 +2,7 @@
 import { posix } from 'path'
 import * as vscode from 'vscode'
 import { PackageJson } from 'type-fest'
-import { showQuickPick, VSCodeQuickPickItem } from 'vscode-framework'
+import { getExtensionSetting, showQuickPick, VSCodeQuickPickItem } from 'vscode-framework'
 import { noCase } from 'change-case'
 import { fsExists, getCurrentWorkspaceRoot } from '@zardoy/vscode-utils/build/fs'
 import { joinPackageJson, supportedFileSchemes } from './util'
@@ -194,3 +194,22 @@ export const throwIfNoPackageJson = async (uriDir: vscode.Uri, needsWrite: boole
         throw new Error('No package.json found. Run `init` first')
     }
 }
+
+export const showPackageJson = async (uri: vscode.Uri, isDir = true) => {
+    if (isDir) uri = joinPackageJson(uri)
+    if (uri.scheme === 'file' && getExtensionSetting('useNoJsonDiagnosticsWorkaround')) {
+        await vscode.commands.executeCommand('workbench.action.quickOpen', uri.fsPath)
+        await new Promise(resolve => {
+            setTimeout(resolve, 25)
+        })
+        await new Promise<void>(resolve => {
+            const { dispose } = vscode.window.onDidChangeActiveTextEditor(() => {
+                resolve()
+                dispose()
+            })
+            void vscode.commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem')
+        })
+    } else {
+        await vscode.window.showTextDocument(uri)
+    }
+}

src/commands-core/packageManager.ts

@@ -221,6 +221,7 @@ const handleRunningTask = (command: string, args: string[], shortTitle: string)
     return undefined
 }
 
+//@ts-expect-error
 const executeTaskShared = async (
     data:
         | 'reveal'

src/commands/openClosestPackageJson.ts

@@ -1,6 +1,6 @@
 import vscode from 'vscode'
 import { fsExists } from '@zardoy/vscode-utils/build/fs'
-import { findUpPackageJson } from '../commands-core/packageJson'
+import { findUpPackageJson, showPackageJson } from '../commands-core/packageJson'
 import { joinPackageJson, supportedFileSchemes } from '../commands-core/util'
 
 export const openClosestPackageJson = async () => {
@@ -13,16 +13,16 @@ export const openClosestPackageJson = async () => {
         if (!firstWorkspace) return
         const uriToOpen = joinPackageJson(firstWorkspace.uri)
         if (!(await fsExists(uriToOpen, true))) return
-        await vscode.window.showTextDocument(uriToOpen)
+        await showPackageJson(uriToOpen, false)
         return
     }
 
-    const closestPackageJson = await findUpPackageJson(uri)
-    if (closestPackageJson === undefined) {
+    const closestPackageJsonDir = await findUpPackageJson(uri)
+    if (closestPackageJsonDir === undefined) {
         await vscode.window.showWarningMessage('No closest package.json found')
         return
     }
 
-    await vscode.window.showTextDocument(joinPackageJson(closestPackageJson))
+    await showPackageJson(closestPackageJsonDir)
     return undefined
 }

src/commands/openPackageAt.ts

@@ -3,8 +3,8 @@ import defaultBranch from 'default-branch'
 import { getExtensionCommandId, getExtensionSetting, registerExtensionCommand, RegularCommands, showQuickPick } from 'vscode-framework'
 import { getCurrentWorkspaceRoot } from '@zardoy/vscode-utils/build/fs'
 import { noCase } from 'change-case'
-import { findUpNodeModules, pickInstalledDeps, readDirPackageJson } from '../commands-core/packageJson'
-import { joinPackageJson, supportedFileSchemes } from '../commands-core/util'
+import { findUpNodeModules, pickInstalledDeps, readDirPackageJson, showPackageJson } from '../commands-core/packageJson'
+import { supportedFileSchemes } from '../commands-core/util'
 import { getPackageRepositoryUrl } from './npmOpenRepository'
 
 /** get module dir URI from closest node_modules */
@@ -93,8 +93,8 @@ export const registerOpenPackageAtCommands = () => {
     registerExtensionCommand('openPackagePackageJson', async ({ command: commandId }, module?: string) => {
         if (!module) module = await pickInstalledDeps({ commandId, multiple: false, flatTypes: false })
         if (module === undefined) return
-        const packageJsonUri = joinPackageJson(await getClosestModulePath(module))
-        await vscode.window.showTextDocument(packageJsonUri)
+        const packageJsonUriDir = await getClosestModulePath(module)
+        await showPackageJson(packageJsonUriDir)
     })
 
     registerExtensionCommand('openPackageAt', async ({ command: commandId }, module?: string) => {

src/commands/openWorkspacePackageJson.ts

@@ -1,11 +1,9 @@
-import * as vscode from 'vscode'
 import { getCurrentWorkspaceRoot } from '@zardoy/vscode-utils/build/fs'
 import { registerExtensionCommand } from 'vscode-framework'
-import { joinPackageJson } from '../commands-core/util'
+import { showPackageJson } from '../commands-core/packageJson'
 
 export default () => {
     registerExtensionCommand('openWorkspacePackageJson', async () => {
-        const currentWorkspace = getCurrentWorkspaceRoot()
-        await vscode.window.showTextDocument(joinPackageJson(currentWorkspace.uri))
+        await showPackageJson(getCurrentWorkspaceRoot().uri)
     })
 }

src/commands/runNpmScript.ts

@@ -4,7 +4,7 @@ import { getExtensionSetting, VSCodeQuickPickItem } from 'vscode-framework'
 import { showQuickPick } from '@zardoy/vscode-utils/build/quickPick'
 import delay from 'delay'
 import { launchNpmTask } from '../commands-core/npmScripts'
-import { joinPackageJson } from '../commands-core/util'
+import { showPackageJson } from '../commands-core/packageJson'
 
 const recentlyTouchedScripts: string[] = []
 
@@ -55,8 +55,8 @@ export const runNpmScript = async (_, scriptArgs?: string | LaunchScriptArgs) =>
                         iconPath: new vscode.ThemeIcon('go-to-file'),
                         tooltip: 'Reveal script in package.json',
                         async click() {
-                            const packageJsonUri = joinPackageJson(dir)
-                            const editor = await vscode.window.showTextDocument(packageJsonUri)
+                            await showPackageJson(dir)
+                            const editor = vscode.window.activeTextEditor!
                             const { document } = editor
                             const { offset, length } = findNodeAtLocation(parseTree(document.getText())!, ['scripts', scriptName])!
                             editor.selection = new vscode.Selection(document.positionAt(offset + 1), document.positionAt(offset + 1 + length - 2))

src/configurationType.ts

@@ -254,4 +254,6 @@ export type Configuration = {
     depsValueLinkAction: PackageLinkAction
     /** @default true */
     // enableTerminalLinkProvider: boolean
+    /** @default true */
+    useNoJsonDiagnosticsWorkaround: boolean
 }

src/configurationTypeCache.jsonc

@@ -1,5 +1,5 @@
 // GENERATED. DON'T EDIT MANUALLY
-// md5hash: 727c6dc098ff2d974cc6d2d008fa6827
+// md5hash: 4a565685fba6c6f1922f0623441870fc
 {
     "type": "object",
     "properties": {
@@ -324,6 +324,10 @@
                 "revealInExplorer"
             ],
             "type": "string"
+        },
+        "useNoJsonDiagnosticsWorkaround": {
+            "default": true,
+            "type": "boolean"
         }
     },
     "required": [
@@ -353,6 +357,7 @@
         "search.includeDeprecated",
         "search.provder",
         "statusbar.showMainScriptStatus",
-        "useIntegratedTerminal"
+        "useIntegratedTerminal",
+        "useNoJsonDiagnosticsWorkaround"
     ]
 }