Skip to content

fix: enable goto definition in VSCode for declarations in stdlib #142

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
Dec 7, 2022
Merged

fix: enable goto definition in VSCode for declarations in stdlib #142

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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ dist
.vercel
.DS_Store
.vscode/settings.json
.env.local
30 changes: 19 additions & 11 deletions packages/schema/build/env-plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,27 @@ module.exports = {
function _findEnvFile(dir) {
if (!fs.existsSync(dir)) return undefined;

if (fs.existsSync(`${dir}/.env.${ENV}`)) {
return `${dir}/.env.${ENV}`;
} else if (fs.existsSync(`${dir}/.env`)) {
return `${dir}/.env`;
} else {
const next = path.resolve(dir, '../');
if (next === dir) {
// at root now, exit
return undefined;
} else {
return _findEnvFile(next);
const candidates = [
`${dir}/.env.${ENV}.local`,
`${dir}/.env.${ENV}`,
`${dir}/.env.local`,
`${dir}/.env`,
];

for (const candidate of candidates) {
if (fs.existsSync(candidate)) {
console.log('Using env from:', candidate);
return candidate;
}
}

const next = path.resolve(dir, '../');
if (next === dir) {
// at root now, exit
return undefined;
} else {
return _findEnvFile(next);
}
}

build.onResolve({ filter: /^env$/ }, async (args) => {
Expand Down
87 changes: 0 additions & 87 deletions packages/schema/src/language-server/lsp/zmodel-definition-provider.ts
View file
Open in desktop

This file was deleted.

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 @@ -129,10 +129,6 @@ export class ZModelLinker extends DefaultLinker {
document: LangiumDocument,
extraScopes: ScopeProvider[] = []
) {
if (node.$resolvedType) {
return;
}

switch (node.$type) {
case LiteralExpr:
this.resolveLiteral(node as LiteralExpr);
Expand Down
5 changes: 0 additions & 5 deletions packages/schema/src/language-server/zmodel-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import {
import { TextDocuments } from 'vscode-languageserver';
import { TextDocument } from 'vscode-languageserver-textdocument';
import ZModelWorkspaceManager from './zmodel-workspace-manager';
import ZModelDefinitionProvider from './lsp/zmodel-definition-provider';

/**
* Declaration of custom services - add your own service classes here.
Expand Down Expand Up @@ -65,10 +64,6 @@ export const ZModelModule: Module<
new ZModelValidationRegistry(services),
ZModelValidator: () => new ZModelValidator(),
},
lsp: {
DefinitionProvider: (services) =>
new ZModelDefinitionProvider(services),
},
};

// this duplicates createDefaultSharedModule except that a custom WorkspaceManager is used
Expand Down