Skip to content

Fix syntax highlight #12

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

Open
ryokaji wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix syntax highlight #12

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc49cf1
refer parser's definition
ryokaji Mar 7, 2026
067b63d
annotate parsed object, fix its structure
ryokaji Mar 7, 2026
5762b8e
revert auto format
ryokaji Mar 12, 2026
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
81 changes: 29 additions & 52 deletions src/semanticTokenProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as vscode from "vscode";
import { parse } from "./useParserWorker";
import { ParseResult, RangeType } from "@markwhen/parser";

const tokenTypes = [
"comment",
Expand All @@ -12,29 +13,7 @@ const tokenTypes = [
"type",
"class",
];
enum RangeType {
Comment = "comment",
CheckboxItemIndicator = "checkboxItemIndicator",
listItemIndicator = "listItemIndicator",
ListItemContents = "listItemContents",
Tag = "tag",
tagDefinition = "tagDefinition",
Title = "title",
View = "view",
Viewer = "viewer",
Description = "description",
Section = "section",
DateRange = "dateRange",
DateRangeColon = "dateRangeColon",
Event = "event",
Edit = "edit",
Editor = "editor",
Recurrence = "recurrence",
FrontmatterDelimiter = "frontMatterDelimiter",
HeaderKey = "headerKey",
HeaderKeyColon = "headerKeyColon",
HeaderValue = "headerValue"
}

export const legend = new vscode.SemanticTokensLegend(tokenTypes, []);

export const provider: vscode.DocumentSemanticTokensProvider = {
Expand All @@ -43,35 +22,33 @@ export const provider: vscode.DocumentSemanticTokensProvider = {
): Promise<vscode.SemanticTokens> {
const tokensBuilder = new vscode.SemanticTokensBuilder(legend);

const markwhen = await parse(document.getText());
markwhen.timelines.forEach((timeline: any) => {
timeline.ranges.forEach((range: any) => {
const from = document.positionAt(range.from);
const to = document.positionAt(range.to);
const vscodeRange = new vscode.Range(from, to);
switch (range.type) {
case RangeType.listItemIndicator:
case RangeType.CheckboxItemIndicator:
tokensBuilder.push(vscodeRange, "variable");
break;
case RangeType.Comment:
tokensBuilder.push(vscodeRange, "comment");
break;
case RangeType.DateRange:
tokensBuilder.push(vscodeRange, "type");
break;
case RangeType.Description:
case RangeType.Section:
case RangeType.Title:
case RangeType.View:
tokensBuilder.push(vscodeRange, "keyword");
break;
case RangeType.Tag:
tokensBuilder.push(vscodeRange, "property");
case RangeType.Recurrence:
tokensBuilder.push(vscodeRange, "class");
}
});
const markwhen = (await parse(document.getText())) as ParseResult;
markwhen.ranges.forEach((range: any) => {
const from = document.positionAt(range.from);
const to = document.positionAt(range.to);
const vscodeRange = new vscode.Range(from, to);
switch (range.type) {
case RangeType.listItemIndicator:
case RangeType.CheckboxItemIndicator:
tokensBuilder.push(vscodeRange, "variable");
break;
case RangeType.Comment:
tokensBuilder.push(vscodeRange, "comment");
break;
case RangeType.DateRange:
tokensBuilder.push(vscodeRange, "type");
break;
case RangeType.Description:
case RangeType.Section:
case RangeType.Title:
case RangeType.View:
tokensBuilder.push(vscodeRange, "keyword");
break;
case RangeType.Tag:
tokensBuilder.push(vscodeRange, "property");
case RangeType.Recurrence:
tokensBuilder.push(vscodeRange, "class");
}
});

return tokensBuilder.build();
Expand Down