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
7 changes: 7 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@
],
"configuration": "./language-configuration.json"
}
],
"grammars": [
{
"language": "jref",
"scopeName": "source.jref",
"path": "./syntaxes/jref.tmLanguage.json"
}
]
},
"workspaces": [
Expand Down
10 changes: 3 additions & 7 deletions server/src/definition.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
import path from 'path';
import { URI } from 'vscode-uri';

import { DefinitionParams, DefinitionLink, TextDocuments, Range } from 'vscode-languageserver/node';
import { DefinitionParams, DefinitionLink, Range } from 'vscode-languageserver/node';
import { TextDocument } from 'vscode-languageserver-textdocument';
import { JRefSymbol, SymbolTable } from './visitor';

interface ServerContext {
documents: TextDocuments<TextDocument>;
documentSymbols: WeakMap<TextDocument, SymbolTable>;
}
import { JRefSymbol } from './visitor';
import { ServerContext } from './utils';

const defaultTargetRange: Range = {
start: { line: 0, character: 0 },
Expand Down
43 changes: 43 additions & 0 deletions server/src/semanticTokens.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import {
SemanticTokensBuilder,
SemanticTokens,
SemanticTokensParams,
} from 'vscode-languageserver/node';
import { ServerContext } from './utils';

export const tokenTypes = ['function'];

const tokenToIndex = Object.fromEntries(tokenTypes.map((type, index) => [type, index])) as Record<
string,
number
>;

export function handleSemanticTokens(
params: SemanticTokensParams,
context: ServerContext,
): SemanticTokens {
const { documents, documentSymbols } = context;
const document = documents.get(params.textDocument.uri);
if (!document) return { data: [] };
const tokensBuilder = new SemanticTokensBuilder();

const symbols = documentSymbols.get(document);
if (!symbols || symbols.size === 0) return { data: [] };

const refs = Array.from(symbols.values()).filter((symbol) => symbol.isReference);
for (const ref of refs) {
const valueNode = ref.node;
const valuePosition = document.positionAt(valueNode.offset);

// Highlight the value string
tokensBuilder.push(
valuePosition.line,
valuePosition.character,
valueNode.length,
tokenToIndex['function'],
0,
);
}

return tokensBuilder.build();
}
14 changes: 13 additions & 1 deletion server/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ import { Node, ParseError, parseTree } from 'jsonc-parser';
import { createParseErrorDiagnostic } from './diagnostics';

import { onDefinition } from './definition';
import { JRefSymbol, SymbolTable, visit } from './visitor';
import { SymbolTable, visit } from './visitor';
import { handleSemanticTokens, tokenTypes } from './semanticTokens';

// Create a connection for the server, using Node's IPC as a transport.
// Also include all preview / proposed LSP features.
Expand All @@ -28,6 +29,13 @@ connection.onInitialize((params: InitializeParams) => {
capabilities: {
textDocumentSync: TextDocumentSyncKind.Incremental,
definitionProvider: true,
semanticTokensProvider: {
legend: {
tokenTypes,
tokenModifiers: [],
},
full: true,
},
},
};
return result;
Expand All @@ -53,6 +61,10 @@ function sendDiagnostics(document: TextDocument, parseErrors: ParseError[]) {

connection.onDefinition((params) => onDefinition(params, { documents, documentSymbols }));

connection.languages.semanticTokens.on((params) =>
handleSemanticTokens(params, { documents, documentSymbols }),
);

// Make the text document manager listen on the connection
// for open, change and close text document events
documents.listen(connection);
Expand Down
8 changes: 8 additions & 0 deletions server/src/utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { TextDocuments } from 'vscode-languageserver/node';
import { SymbolTable } from './visitor';
import { TextDocument } from 'vscode-languageserver-textdocument';

export interface ServerContext {
documents: TextDocuments<TextDocument>;
documentSymbols: WeakMap<TextDocument, SymbolTable>;
}
9 changes: 9 additions & 0 deletions syntaxes/jref.tmlanguage.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"scopeName": "source.jref",
"injectionSelector": "L:source.json",
"patterns": [
{
"include": "source.json"
}
]
}