nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-10 05:53:10 +00:00
Code Issues Packages Projects Releases 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 scopes from './scopes';
import * as scopesMapper from './scopes_mapper'; import * as scopesMapper from './scopes_mapper';
import { Server } from './server';
import { Ctx } from './ctx'; import { Ctx } from './ctx';
export function activateHighlighting(ctx: Ctx) { export function activateHighlighting(ctx: Ctx) {
const highlighter = new Highlighter(); const highlighter = new Highlighter(ctx);
ctx.client.onReady().then(() => { ctx.client.onReady().then(() => {
ctx.client.onNotification( ctx.client.onNotification(
@ -118,6 +117,12 @@ function createDecorationFromTextmate(
} }
class Highlighter { class Highlighter {
private ctx: Ctx;
constructor(ctx: Ctx) {
this.ctx = ctx;
}
private static initDecorations(): Map< private static initDecorations(): Map<
string, string,
vscode.TextEditorDecorationType vscode.TextEditorDecorationType
@ -213,7 +218,7 @@ class Highlighter {
string, string,
[vscode.Range[], boolean] [vscode.Range[], boolean]
> = new Map(); > = new Map();
const rainbowTime = Server.config.rainbowHighlightingOn; const rainbowTime = this.ctx.config.rainbowHighlightingOn;
for (const tag of this.decorations.keys()) { for (const tag of this.decorations.keys()) {
byTag.set(tag, []); byTag.set(tag, []);
@ -232,13 +237,13 @@ class Highlighter {
colorfulIdents colorfulIdents
.get(d.bindingHash)![0] .get(d.bindingHash)![0]
.push( .push(
Server.client.protocol2CodeConverter.asRange(d.range), this.ctx.client.protocol2CodeConverter.asRange(d.range),
); );
} else { } else {
byTag byTag
.get(d.tag)! .get(d.tag)!
.push( .push(
Server.client.protocol2CodeConverter.asRange(d.range), this.ctx.client.protocol2CodeConverter.asRange(d.range),
); );
} }
} }