Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use Ctx in highlighter

Browse source
This commit is contained in:
Aleksey Kladov 2019-12-30 23:40:48 +01:00
parent 09649a991d
commit c65e90f7b8
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
editors/code/src/highlighting.ts
View file

@ -6,11 +6,10 @@ const seedrandom = seedrandom_; // https://github.com/jvandemo/generator-angular
import * as scopes from './scopes';
import * as scopesMapper from './scopes_mapper';
import { Server } from './server';
import { Ctx } from './ctx';
export function activateHighlighting(ctx: Ctx) {
const highlighter = new Highlighter();
const highlighter = new Highlighter(ctx);
ctx.client.onReady().then(() => {
ctx.client.onNotification(
@ -118,6 +117,12 @@ function createDecorationFromTextmate(
}
class Highlighter {
private ctx: Ctx;
constructor(ctx: Ctx) {
this.ctx = ctx;
}
private static initDecorations(): Map<
string,
vscode.TextEditorDecorationType
@ -213,7 +218,7 @@ class Highlighter {
string,
[vscode.Range[], boolean]
> = new Map();
const rainbowTime = Server.config.rainbowHighlightingOn;
const rainbowTime = this.ctx.config.rainbowHighlightingOn;
for (const tag of this.decorations.keys()) {
byTag.set(tag, []);
@ -232,13 +237,13 @@ class Highlighter {
colorfulIdents
.get(d.bindingHash)![0]
.push(
Server.client.protocol2CodeConverter.asRange(d.range),
this.ctx.client.protocol2CodeConverter.asRange(d.range),
);
} else {
byTag
.get(d.tag)!
.push(
Server.client.protocol2CodeConverter.asRange(d.range),
this.ctx.client.protocol2CodeConverter.asRange(d.range),
);
}
}