Skip to content

fix: proceed with linking even if zmodel contains parsing error #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 3, 2023
Merged

fix: proceed with linking even if zmodel contains parsing error #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/schema/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/schema/src/language-server/zmodel-linker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ export class ZModelLinker extends DefaultLinker {
//#region Reference linking

async link(document: LangiumDocument, cancelToken = CancellationToken.None): Promise<void> {
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);
Expand Down
44 changes: 2 additions & 42 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.