Skip to content

Fix syntax highlighting with tree sitter for nested scopes #228378

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

Merged
alexr00 merged 1 commit into from
Sep 12, 2024
Merged

Fix syntax highlighting with tree sitter for nested scopes #228378

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
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
if (captures && captures.length > 0) {
dom.append(tbody, $('tr', undefined,
$('td.tiw-metadata-key', undefined, 'foreground'),
$('td.tiw-metadata-value', undefined, captures[0].name),
$('td.tiw-metadata-value', undefined, captures[captures.length - 1].name),
));
}
}
Expand Down
37 changes: 31 additions & 6 deletions src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,12 @@ class TreeSitterTokenizationSupport extends Disposable implements ITreeSitterTok
let tokenIndex = 0;
const lineStartOffset = textModel.getOffsetAt({ lineNumber: lineNumber, column: 1 });

const increaseSizeOfTokensByOneToken = () => {
const newTokens = new Uint32Array(tokens.length + 2);
newTokens.set(tokens);
tokens = newTokens;
};

for (let captureIndex = 0; captureIndex < captures.length; captureIndex++) {
const capture = captures[captureIndex];
const metadata = this.findMetadata(capture.name);
Expand All @@ -178,17 +184,36 @@ class TreeSitterTokenizationSupport extends Disposable implements ITreeSitterTok
}
const intermediateTokenOffset = lineRelativeOffset - currentTokenLength;
if (previousTokenEnd < intermediateTokenOffset) {
// Add en empty token to cover the space where there were no captures
tokens[tokenIndex * 2] = intermediateTokenOffset;
tokens[tokenIndex * 2 + 1] = 0;
tokenIndex++;
const newTokens = new Uint32Array(tokens.length + 2);
newTokens.set(tokens);
tokens = newTokens;

increaseSizeOfTokensByOneToken();
}

tokens[tokenIndex * 2] = lineRelativeOffset;
tokens[tokenIndex * 2 + 1] = metadata;
tokenIndex++;
const addCurrentTokenToArray = () => {
tokens[tokenIndex * 2] = lineRelativeOffset;
tokens[tokenIndex * 2 + 1] = metadata;
tokenIndex++;
};

if (previousTokenEnd > lineRelativeOffset) {
// The current token is within the previous token. Adjust the end of the previous token.
const originalPreviousTokenEndOffset = tokens[(tokenIndex - 1) * 2];
tokens[(tokenIndex - 1) * 2] = intermediateTokenOffset;

addCurrentTokenToArray();
// Add the rest of the previous token after the current token
increaseSizeOfTokensByOneToken();
tokens[tokenIndex * 2] = originalPreviousTokenEndOffset;
tokens[tokenIndex * 2 + 1] = tokens[(tokenIndex - 2) * 2 + 1];
tokenIndex++;

} else {
// Just add the token to the array
addCurrentTokenToArray();
}
}

if (captures[captures.length - 1].node.endPosition.column + 1 < lineLength) {
Expand Down