diff --git a/l10n/bundle.l10n.zh-tw.json b/l10n/bundle.l10n.zh-tw.json index 0f94dbf..4df7ea5 100644 --- a/l10n/bundle.l10n.zh-tw.json +++ b/l10n/bundle.l10n.zh-tw.json @@ -1,28 +1,28 @@ { - "info.test.hello": "hello in English", - "info.welcome.title": "Thanks for using Digital-IDE ❤️. Your star will be our best motivation! 😊", - "info.welcome.star": "Star", - "info.welcome.refuse": "Refuse", - "info.progress.register-command": "Register Command", - "info.progress.active-lsp-server": "Activate LSP Server", - "info.progress.initialization": "Initialization", - "info.progress.build-module-tree": "Build Module Tree", - "info.progress.download-digital-lsp": "Download Digital LSP", - "info.progress.choose-best-download-source": "Choose Best Download Source", - "info.progress.extract-digital-lsp": "Extract Digital LSP", - "error.lsp.download-digital-lsp": "Fail to download digital lsp server, check your network and reload vscode. You can also visit following site and download manually: https://github.com/Digital-EDA/Digital-IDE/releases/tag/", - "error.filelist.save-file": "保存文件失败", - "warning.ppy.already-exist": "property.json 已经存在了！", + "info.test.hello": "你好", + "info.welcome.title": "感謝使用 Digital-IDE ❤️。您的星標將是我們最大的動力！😊", + "info.welcome.star": "點亮星標", + "info.welcome.refuse": "拒絕", + "info.progress.register-command": "註冊命令", + "info.progress.active-lsp-server": "激活 LSP 伺服器", + "info.progress.initialization": "初始化", + "info.progress.build-module-tree": "構建模塊樹", + "info.progress.download-digital-lsp": "下載 Digital LSP", + "info.progress.choose-best-download-source": "選擇最佳下載源", + "info.progress.extract-digital-lsp": "提取 Digital LSP", + "error.lsp.download-digital-lsp": "下載 digital lsp 伺服器失敗，請檢查您的網絡並重新加載 vscode。您也可以訪問以下站點手動下載：https://github.com/Digital-EDA/Digital-IDE/releases/tag/", + "error.filelist.save-file": "保存文件失敗", + "warning.ppy.already-exist": "property.json 已經存在了！", "info.monitor.update-hdlparam": "更新 HdlParam", "info.monitor.update-pl": "更新 PL", "info.vcd-viewer.save": "保存", - "info.vcd-viewer.save-as-view": "另存为视图文件", - "info.vcd-viewer.vcd-view-file": "vcd 视图文件", + "info.vcd-viewer.save-as-view": "另存為視圖文件", + "info.vcd-viewer.vcd-view-file": "vcd 視圖文件", "info.vcd-viewer.all-file": "所有文件", - "info.vcd-viewer.load.button": "加载", - "info.vcd-viewer.load.title": "加载视图文件", - "error.vcd-viewer.bad-view-file": "视图文件已损坏", - "error.vcd-viewer.unexist-direct-vcd-file": "视图文件指向的 vcd 文件不存在", - "info.welcome.join-qq-group": "Click the link to join the QQ group", - "info.level.test": "这是一个简单的样例" + "info.vcd-viewer.load.button": "加載", + "info.vcd-viewer.load.title": "加載視圖文件", + "error.vcd-viewer.bad-view-file": "視圖文件已損壞", + "error.vcd-viewer.unexist-direct-vcd-file": "視圖文件指向的 vcd 文件不存在", + "info.welcome.join-qq-group": "點擊鏈接加入 QQ 群", + "info.level.test": "這是一個簡單的樣例" } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 0120be1..956b9a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "tar": "^7.4.3", "temp": "^0.9.4", "vscode-jsonrpc": "^8.2.1", - "vscode-languageclient": "^7.0.0", + "vscode-languageclient": "^9.0.1", "vscode-textmate": "^9.0.0", "wavedrom": "^2.9.1", "zlib": "^1.0.5" @@ -38,7 +38,7 @@ "webpack-cli": "^5.1.4" }, "engines": { - "vscode": "^1.72.0" + "vscode": "^1.95.0" } }, "node_modules/@discoveryjs/json-ext": { @@ -4208,39 +4208,58 @@ } }, "node_modules/vscode-languageclient": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz", - "integrity": "sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-9.0.1.tgz", + "integrity": "sha512-JZiimVdvimEuHh5olxhxkht09m3JzUGwggb5eRUkzzJhZ2KjCN0nh55VfiED9oez9DyF8/fz1g1iBV3h+0Z2EA==", "dependencies": { - "minimatch": "^3.0.4", - "semver": "^7.3.4", - "vscode-languageserver-protocol": "3.16.0" + "minimatch": "^5.1.0", + "semver": "^7.3.7", + "vscode-languageserver-protocol": "3.17.5" }, "engines": { - "vscode": "^1.52.0" + "vscode": "^1.82.0" + } + }, + "node_modules/vscode-languageclient/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/vscode-languageclient/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" } }, "node_modules/vscode-languageserver-protocol": { - "version": "3.16.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz", - "integrity": "sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==", + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz", + "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==", "dependencies": { - "vscode-jsonrpc": "6.0.0", - "vscode-languageserver-types": "3.16.0" + "vscode-jsonrpc": "8.2.0", + "vscode-languageserver-types": "3.17.5" } }, "node_modules/vscode-languageserver-protocol/node_modules/vscode-jsonrpc": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz", - "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", + "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==", "engines": { - "node": ">=8.0.0 || >=10.0.0" + "node": ">=14.0.0" } }, "node_modules/vscode-languageserver-types": { - "version": "3.16.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz", - "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==" + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", + "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==" }, "node_modules/vscode-textmate": { "version": "9.0.0", @@ -7809,35 +7828,53 @@ "integrity": "sha512-kdjOSJ2lLIn7r1rtrMbbNCHjyMPfRnowdKjBQ+mGq6NAW5QY2bEZC/khaC5OR8svbbjvLEaIXkOq45e2X9BIbQ==" }, "vscode-languageclient": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz", - "integrity": "sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-9.0.1.tgz", + "integrity": "sha512-JZiimVdvimEuHh5olxhxkht09m3JzUGwggb5eRUkzzJhZ2KjCN0nh55VfiED9oez9DyF8/fz1g1iBV3h+0Z2EA==", "requires": { - "minimatch": "^3.0.4", - "semver": "^7.3.4", - "vscode-languageserver-protocol": "3.16.0" + "minimatch": "^5.1.0", + "semver": "^7.3.7", + "vscode-languageserver-protocol": "3.17.5" + }, + "dependencies": { + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "requires": { + "balanced-match": "^1.0.0" + } + }, + "minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "requires": { + "brace-expansion": "^2.0.1" + } + } } }, "vscode-languageserver-protocol": { - "version": "3.16.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz", - "integrity": "sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==", + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz", + "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==", "requires": { - "vscode-jsonrpc": "6.0.0", - "vscode-languageserver-types": "3.16.0" + "vscode-jsonrpc": "8.2.0", + "vscode-languageserver-types": "3.17.5" }, "dependencies": { "vscode-jsonrpc": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz", - "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==" + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", + "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==" } } }, "vscode-languageserver-types": { - "version": "3.16.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz", - "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==" + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", + "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==" }, "vscode-textmate": { "version": "9.0.0", diff --git a/package.json b/package.json index 91545cb..3fc9d3c 100644 --- a/package.json +++ b/package.json @@ -1207,7 +1207,7 @@ "tar": "^7.4.3", "temp": "^0.9.4", "vscode-jsonrpc": "^8.2.1", - "vscode-languageclient": "^7.0.0", + "vscode-languageclient": "^9.0.1", "vscode-textmate": "^9.0.0", "wavedrom": "^2.9.1", "zlib": "^1.0.5" diff --git a/src/extension.ts b/src/extension.ts index fbe08a0..82cf4e2 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -45,8 +45,7 @@ async function launch(context: vscode.ExtensionContext) { }); await lspClient.activate(context, versionString); - await LspClient.DigitalIDE?.onReady(); - + await vscode.window.withProgress({ location: vscode.ProgressLocation.Window, title: t('info.progress.initialization') diff --git a/src/function/lsp-client/index.ts b/src/function/lsp-client/index.ts index 597e1f3..c141c2f 100644 --- a/src/function/lsp-client/index.ts +++ b/src/function/lsp-client/index.ts @@ -181,6 +181,7 @@ export async function activate(context: vscode.ExtensionContext, version: string language: 'vhdl' } ], + progressOnInitialization: true, markdown: { isTrusted: true } @@ -194,7 +195,7 @@ export async function activate(context: vscode.ExtensionContext, version: string ); LspClient.DigitalIDE = client; - client.start(); + await client.start(); } export function deactivate(): Thenable | undefined { diff --git a/src/function/treeView/index.ts b/src/function/treeView/index.ts index b7ed0a7..f35da72 100644 --- a/src/function/treeView/index.ts +++ b/src/function/treeView/index.ts @@ -7,9 +7,9 @@ import { Range } from '../../hdlParser/common'; async function openFileAtPosition(uri: vscode.Uri, range: Range) { - const document = await vscode.workspace.openTextDocument(uri); - const start = new vscode.Position(range.start.line - 1, range.start.character - 1); - const end = new vscode.Position(range.end.line - 1, range.end.character - 1); + const document = await vscode.workspace.openTextDocument(uri); + const start = new vscode.Position(range.start.line, range.start.character); + const end = new vscode.Position(range.end.line, range.end.character); await vscode.window.showTextDocument( document, @@ -19,7 +19,7 @@ async function openFileAtPosition(uri: vscode.Uri, range: Range) { ); } -function openFileByUri(path: string, range: Range) { +function openFileByUri(path: string, range: Range) { if (range === undefined) { vscode.window.showErrorMessage(`${path} not support jump yet`); return;