Skip to content
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

Jump to bottom

Avoid parsing documents multiple times #32

Merged
merged 1 commit into from
Mar 20, 2024
Merged

Avoid parsing documents multiple times #32

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
5 changes: 1 addition & 4 deletions language-server/src/jsonc-instance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,7 @@ export class JsoncInstance {
}

parent() {
const instance = Object.assign(Object.create(Object.getPrototypeOf(this)), this);
instance.node = instance.node.parent;

return instance;
return new JsoncInstance(this.textDocument, this.root, this.node.parent, this.pointer, this.annotations);
}

startPosition() {
Expand Down
56 changes: 34 additions & 22 deletions language-server/src/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ const validateWorkspace = async () => {
let textDocument = documents.get(uri);
if (!textDocument) {
const instanceJson = await readFile(fileURLToPath(uri), "utf8");
textDocument = TextDocument.create(uri, "json", 1, instanceJson);
textDocument = TextDocument.create(uri, "json", -1, instanceJson);
}

await validateSchema(textDocument);
Expand All @@ -148,6 +148,24 @@ const validateWorkspace = async () => {

connection.onDidChangeWatchedFiles(validateWorkspace);

// MANAGED INSTANCES

const instances = new Map();

const getSchemaResources = async (textDocument) => {
const key = `${textDocument.uri}|${textDocument.version}`;

if (textDocument.version === -1 || !instances.has(key)) {
const instance = JsoncInstance.fromTextDocument(textDocument);
const settings = await getDocumentSettings(instance.textDocument.uri);
const contextDialectUri = instance.get("#/$schema").value() ?? settings.defaultDialect;
const schemaResources = [...decomposeSchemaDocument(instance, contextDialectUri)];
instances.set(key, schemaResources);
}

return instances.get(key);
};

// CONFIGURATION

const documentSettings = new Map();
Expand Down Expand Up @@ -189,24 +207,22 @@ documents.onDidChangeContent(async ({ document }) => {
}
});

const validateSchema = async (document) => {
connection.console.log(`Schema Validation: ${document.uri}`);
const diagnostics = [];
const validateSchema = async (textDocument) => {
connection.console.log(`Schema Validation: ${textDocument.uri}`);

const settings = await getDocumentSettings(document.uri);
const instance = JsoncInstance.fromTextDocument(document);
if (instance.typeOf() === "undefined") {
return;
}
const diagnostics = [];

const contextDialectUri = instance.get("#/$schema").value() ?? settings.defaultDialect;
const schemaResources = decomposeSchemaDocument(instance, contextDialectUri);
const schemaResources = await getSchemaResources(textDocument);
for (const { dialectUri, schemaInstance } of schemaResources) {
if (schemaInstance.typeOf() === "undefined") {
continue;
}

if (!hasDialect(dialectUri)) {
const $schema = schemaInstance.get("#/$schema");
if ($schema.typeOf() === "string") {
diagnostics.push(buildDiagnostic($schema, "Unknown dialect"));
} else if (contextDialectUri) {
} else if (dialectUri) {
diagnostics.push(buildDiagnostic(schemaInstance, "Unknown dialect"));
} else {
diagnostics.push(buildDiagnostic(schemaInstance, "No dialect"));
Expand All @@ -232,7 +248,7 @@ const validateSchema = async (document) => {
}
}

connection.sendDiagnostics({ uri: document.uri, diagnostics });
connection.sendDiagnostics({ uri: textDocument.uri, diagnostics });
};

const buildDiagnostic = (instance, message, severity = DiagnosticSeverity.Error, tags = []) => {
Expand Down Expand Up @@ -301,11 +317,9 @@ const getTokenBuilder = (uri) => {
return tokenBuilders.get(uri);
};

const buildTokens = async (builder, textDocument) => {
const instance = JsoncInstance.fromTextDocument(textDocument);
const settings = await getDocumentSettings(textDocument.uri);
const dialectUri = instance.get("#/$schema").value() ?? settings.defaultDialect;
const schemaResources = decomposeSchemaDocument(instance, dialectUri, connection);
const buildTokens = async (builder, uri) => {
const textDocument = documents.get(uri);
const schemaResources = await getSchemaResources(textDocument);
for (const { keywordInstance, tokenType, tokenModifier } of getSemanticTokens(schemaResources)) {
const startPosition = keywordInstance.startPosition();
builder.push(
Expand All @@ -326,8 +340,7 @@ connection.languages.semanticTokens.on(async ({ textDocument }) => {
}

const builder = getTokenBuilder(textDocument.uri);
const document = documents.get(textDocument.uri);
await buildTokens(builder, document);
await buildTokens(builder, textDocument.uri);

return builder.build();
});
Expand All @@ -337,8 +350,7 @@ connection.languages.semanticTokens.onDelta(async ({ textDocument, previousResul

const builder = getTokenBuilder(textDocument.uri);
builder.previousResult(previousResultId);
const document = documents.get(textDocument.uri);
await buildTokens(builder, document);
await buildTokens(builder, textDocument.uri);

return builder.buildEdits();
});
Expand Down