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.

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

Support custom semantic tokens & modifiers #958

Merged
merged 2 commits into from
Mar 24, 2022
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
52 changes: 52 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,58 @@
"path": "./syntaxes/terraform.tmGrammar.json"
}
],
"semanticTokenTypes": [
{"id": "hcl-attrName", "superType": "property"},
{"id": "hcl-blockType", "superType": "type"},
{"id": "hcl-blockLabel", "superType": "enumMember"},

{"id": "hcl-bool", "superType": "keyword"},
{"id": "hcl-string", "superType": "string"},
{"id": "hcl-number", "superType": "number"},
{"id": "hcl-objectKey", "superType": "parameter"},
{"id": "hcl-mapKey", "superType": "parameter"},
{"id": "hcl-keyword", "superType": "variable"},
{"id": "hcl-traversalStep", "superType": "variable"},
{"id": "hcl-typeCapsule", "superType": "keyword"},
{"id": "hcl-typePrimitive", "superType": "keyword"}
],
"semanticTokenScopes": [
{
"scopes": {
"hcl-attrName": ["variable.other.property"],
"hcl-blockType": ["entity.name.type"],
"hcl-blockLabel": ["variable.other.enummember"],

"hcl-bool": ["keyword.control"],
"hcl-string": ["string"],
"hcl-number": ["constant.numeric"],
"hcl-objectKey": ["variable.parameter"],
"hcl-mapKey": ["variable.parameter"],
"hcl-keyword": ["keyword.control"],
"hcl-traversalStep": ["variable.other.readwrite"],
"hcl-typeCapsule": ["keyword.control"],
"hcl-typePrimitive": ["keyword.control"]
}
Comment on lines +109 to +123
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

@radeksimko radeksimko Mar 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As per conversation in microsoft/vscode#145312 we could make these more specific, e.g. by appending .hcl to all scopes, but I'm not sure what is the best long-term strategy for token/scope "parity", so I just mostly mimicked the existing behaviours for semantic tokens for now.

}
],
"semanticTokenModifiers": [
{"id": "hcl-dependent"},

{"id": "terraform-data"},
{"id": "terraform-locals"},
{"id": "terraform-module"},
{"id": "terraform-output"},
{"id": "terraform-provider"},
{"id": "terraform-resource"},
{"id": "terraform-provisioner"},
{"id": "terraform-connection"},
{"id": "terraform-variable"},
{"id": "terraform-terraform"},
{"id": "terraform-backend"},
{"id": "terraform-name"},
{"id": "terraform-type"},
{"id": "terraform-requiredProviders"}
],
"snippets": [
{
"language": "terraform",
Expand Down
8 changes: 8 additions & 0 deletions src/clientHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { ServerPath } from './serverPath';
import { ShowReferencesFeature } from './showReferences';
import { TelemetryFeature } from './telemetry';
import { config } from './vscodeUtils';
import { CustomSemanticTokens } from './semanticTokens';

export interface TerraformLanguageClient {
commandPrefix: string;
Expand All @@ -29,6 +30,9 @@ export class ClientHandler {
private tfClient: TerraformLanguageClient | undefined;
private commands: string[] = [];

public extSemanticTokenTypes: string[] = [];
public extSemanticTokenModifiers: string[] = [];

constructor(
private lsPath: ServerPath,
private outputChannel: vscode.OutputChannel,
Expand Down Expand Up @@ -86,6 +90,10 @@ export class ClientHandler {
const id = `terraform`;
const client = new LanguageClient(id, serverOptions, clientOptions);

client.registerFeature(
new CustomSemanticTokens(client, this.extSemanticTokenTypes, this.extSemanticTokenModifiers),
);

const codeLensReferenceCount = config('terraform').get<boolean>('codelens.referenceCount');
if (codeLensReferenceCount) {
client.registerFeature(new ShowReferencesFeature(client));
Expand Down
28 changes: 28 additions & 0 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>

const lsPath = new ServerPath(context);
clientHandler = new ClientHandler(lsPath, outputChannel, reporter);
clientHandler.extSemanticTokenTypes = tokenTypesFromExtManifest(manifest);
clientHandler.extSemanticTokenModifiers = tokenModifiersFromExtManifest(manifest);

// get rid of pre-2.0.0 settings
if (config('terraform').has('languageServer.enabled')) {
Expand Down Expand Up @@ -293,6 +295,32 @@ async function terraformCommand(command: string, languageServerExec = true): Pro
}
}

interface PartialManifest {
contributes: {
semanticTokenTypes?: ObjectWithId[];
semanticTokenModifiers?: ObjectWithId[];
};
}

interface ObjectWithId {
id: string;
}

function tokenTypesFromExtManifest(manifest: PartialManifest): string[] {
if (!manifest.contributes.semanticTokenTypes) {
return [];
}
return manifest.contributes.semanticTokenTypes.map((token: ObjectWithId) => token.id);
}

function tokenModifiersFromExtManifest(manifest: PartialManifest): string[] {
if (!manifest.contributes.semanticTokenModifiers) {
return [];
}

return manifest.contributes.semanticTokenModifiers.map((modifier: ObjectWithId) => modifier.id);
}

function enabled(): boolean {
return config('terraform').get('languageServer.external', false);
}
30 changes: 30 additions & 0 deletions src/semanticTokens.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { BaseLanguageClient, ClientCapabilities, ServerCapabilities, StaticFeature } from 'vscode-languageclient';

export class CustomSemanticTokens implements StaticFeature {
constructor(
private _client: BaseLanguageClient,
private extTokenTypes: string[],
private extTokenModifiers: string[],
) {}

public fillClientCapabilities(capabilities: ClientCapabilities): void {
if (!capabilities.textDocument || !capabilities.textDocument.semanticTokens) {
return;
}

const tokenTypes = capabilities.textDocument.semanticTokens.tokenTypes;
capabilities.textDocument.semanticTokens.tokenTypes = tokenTypes.concat(this.extTokenTypes);

const tokenModifiers = capabilities.textDocument.semanticTokens.tokenModifiers;
capabilities.textDocument.semanticTokens.tokenModifiers = tokenModifiers.concat(this.extTokenModifiers);
}

// eslint-disable-next-line @typescript-eslint/no-unused-vars
public initialize(capabilities: ServerCapabilities): void {
return;
}

public dispose(): void {
return;
}
}
1 change: 1 addition & 0 deletions src/vscodeUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export function isTerraformFile(document?: vscode.TextDocument): boolean {
return false;
}

// TODO: check for supported language IDs here instead
if (document.fileName.endsWith('tf')) {
// For the purposes of this extension, anything with the tf file
// extension is a Terraform file
Expand Down