Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions language-server/src/build-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { Hover } from "./features/Hover.ts";
import { Completion } from "./features/Completion.ts";
import { FoldingRanges } from "./features/FoldingRanges.ts";
import { DocumentSymbols } from "./features/DocumentSymbols.ts";
import { SelectionRanges } from "./features/SelectionRanges.ts";

import "@hyperjump/json-schema/draft-2020-12";
import "@hyperjump/json-schema/draft-2019-09";
Expand Down Expand Up @@ -41,6 +42,7 @@ export const buildServer = (connection: Connection): Server => {
new Completion(server, documents);
new FoldingRanges(server, documents);
new DocumentSymbols(server, documents);
new SelectionRanges(server, documents);

return server;
};
5 changes: 1 addition & 4 deletions language-server/src/features/Formatting.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,7 @@ export class Formatting {
});

return edits.map((edit) => ({
range: {
start: jsonDocument.positionAt(edit.offset),
end: jsonDocument.positionAt(edit.offset + edit.length)
},
range: jsonDocument.rangeAt(edit.offset, edit.offset + edit.length),
newText: edit.content
}));
} catch (error: unknown) {
Expand Down
10 changes: 2 additions & 8 deletions language-server/src/features/SchemaValidation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ export class SchemaValidation implements DiagnosticsProvider {
if (node) {
schemaDiagnostics.push({
severity: DiagnosticSeverity.Error,
range: {
start: jsonDocument.positionAt(node.offset),
end: jsonDocument.positionAt(node.offset + node.length)
},
range: jsonDocument.rangeAt(node.offset, node.offset + node.length),
message: formatError(error),
source: "hyperjump-json-language-server"
});
Expand All @@ -35,10 +32,7 @@ export class SchemaValidation implements DiagnosticsProvider {
if (schemaNode) {
schemaDiagnostics.push({
severity: DiagnosticSeverity.Error,
range: {
start: jsonDocument.positionAt(schemaNode.offset),
end: jsonDocument.positionAt(schemaNode.offset + schemaNode.length)
},
range: jsonDocument.rangeAt(schemaNode.offset, schemaNode.offset + schemaNode.length),
message: error instanceof Error ? error.message : String(error),
source: "hyperjump-json-language-server"
});
Expand Down
Loading
Loading