From e3aa6466d6d24f31695682a699642671c2db68a0 Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Mon, 3 Apr 2023 12:50:27 +0800 Subject: [PATCH] fix: proceed with linking even if zmodel contains parsing error (otherwise VSCode extension may break) --- packages/schema/package.json | 3 +- .../src/language-server/zmodel-linker.ts | 4 -- pnpm-lock.yaml | 44 +------------------ 3 files changed, 3 insertions(+), 48 deletions(-) diff --git a/packages/schema/package.json b/packages/schema/package.json index e9cb9982f..32914eafa 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -66,7 +66,7 @@ "main": "./bundle/extension.js", "scripts": { "vscode:publish": "vsce publish --no-dependencies", - "vscode:prepublish": "pnpm lint && pnpm bundle", + "vscode:prepublish": "pnpm bundle", "vscode:package": "vsce package --no-dependencies", "clean": "rimraf bundle dist", "build": "pnpm clean && pnpm lint && tsc && copyfiles -F \"bin/*\" dist && copyfiles ./README-global.md ./LICENSE ./package.json dist && renamer --replace \"README.md\" dist/README-global.md && copyfiles -u 1 \"src/res/*\" dist && node build/post-build.js", @@ -130,7 +130,6 @@ "eslint": "^8.27.0", "eslint-plugin-jest": "^27.1.7", "jest": "^29.2.1", - "langium-cli": "^1.0.0", "prisma": "^4.0.0", "renamer": "^4.0.0", "rimraf": "^3.0.2", diff --git a/packages/schema/src/language-server/zmodel-linker.ts b/packages/schema/src/language-server/zmodel-linker.ts index c98c0890c..16748b119 100644 --- a/packages/schema/src/language-server/zmodel-linker.ts +++ b/packages/schema/src/language-server/zmodel-linker.ts @@ -66,10 +66,6 @@ export class ZModelLinker extends DefaultLinker { //#region Reference linking async link(document: LangiumDocument, cancelToken = CancellationToken.None): Promise { - if (document.parseResult.lexerErrors?.length > 0 || document.parseResult.parserErrors?.length > 0) { - return; - } - for (const node of streamContents(document.parseResult.value)) { await interruptAndCheck(cancelToken); this.resolve(node, document); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1becdcd2a..503065162 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -473,9 +473,6 @@ importers: jest: specifier: ^29.2.1 version: 29.2.1(@types/node@14.18.32)(ts-node@10.9.1) - langium-cli: - specifier: ^1.0.0 - version: 1.0.0 prisma: specifier: ^4.0.0 version: 4.7.0 @@ -4278,11 +4275,6 @@ packages: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} dev: true - /at-least-node@1.0.0: - resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==} - engines: {node: '>= 4.0.0'} - dev: true - /atomic-sleep@1.0.0: resolution: {integrity: sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==} engines: {node: '>=8.0.0'} @@ -5023,6 +5015,7 @@ packages: /commander@8.3.0: resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==} engines: {node: '>= 12'} + dev: false /commander@9.4.1: resolution: {integrity: sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==} @@ -6584,16 +6577,6 @@ packages: universalify: 0.1.2 dev: true - /fs-extra@9.1.0: - resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==} - engines: {node: '>=10'} - dependencies: - at-least-node: 1.0.0 - graceful-fs: 4.2.10 - jsonfile: 6.1.0 - universalify: 2.0.0 - dev: true - /fs-jetpack@5.1.0: resolution: {integrity: sha512-Xn4fDhLydXkuzepZVsr02jakLlmoARPy+YWIclo4kh0GyNGUHnTqeH/w/qIsVn50dFxtp8otPL2t/HcPJBbxUA==} dependencies: @@ -9281,19 +9264,6 @@ packages: engines: {node: '>=6'} dev: true - /langium-cli@1.0.0: - resolution: {integrity: sha512-F5RZu3/PrlRfebMM6irtHDk2cj5PdUzM4y3M5kNu8k5IC3gIhc4QN+aDD2XHYz8hQSA+bCRUIDwCdhy/7VN4cg==} - engines: {node: '>=12.0.0'} - hasBin: true - dependencies: - chalk: 4.1.2 - commander: 8.3.0 - fs-extra: 9.1.0 - jsonschema: 1.4.1 - langium: 1.0.1 - lodash: 4.17.21 - dev: true - /langium-cli@1.1.0: resolution: {integrity: sha512-vnv037FHqXqMeNiNF90v47VrJGiJPzH721UIbbHcu6Nfx0C1UC6SmQhGHtZIDRovT5qJsiXRIPDTZYrIkm4KJQ==} engines: {node: '>=14.0.0'} @@ -9307,17 +9277,6 @@ packages: lodash: 4.17.21 dev: true - /langium@1.0.1: - resolution: {integrity: sha512-9w5NRsspYOOXV56q1EhXeFJWkboAVKZDzIEqPLraMQPQy6fvq104wlVwgvF6w9H4IcCpDHCsHJLsfzQMWBsjAA==} - engines: {node: '>=14.0.0'} - dependencies: - chevrotain: 10.4.2 - chevrotain-allstar: 0.1.4 - vscode-languageserver: 8.0.2 - vscode-languageserver-textdocument: 1.0.7 - vscode-uri: 3.0.7 - dev: true - /langium@1.1.0: resolution: {integrity: sha512-TsWY/DIOR73se9/YaMQZpvfFWWrhWP0FQS9MrpxWEnMJR0FoKVpMF1thPWXZexLSfyEm1pn2oYzCdW4KUBqXxA==} engines: {node: '>=14.0.0'} @@ -12058,6 +12017,7 @@ packages: /vscode-languageserver-textdocument@1.0.7: resolution: {integrity: sha512-bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg==} + dev: false /vscode-languageserver-textdocument@1.0.8: resolution: {integrity: sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q==}