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.

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

Jump to bottom

Dynamically apply highlightingOn config #99

Merged
merged 1 commit into from Oct 7, 2018
Merged

Dynamically apply highlightingOn config #99

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion editors/code/package.json
View file
Open in desktop
Expand Up @@ -111,7 +111,7 @@
],
"configuration": {
"type": "object",
"title": "Rust Analyzer configuration",
"title": "Rust Analyzer",
"properties": {
"ra-lsp.highlightingOn": {
"type": "boolean",
Expand Down
47 changes: 36 additions & 11 deletions editors/code/src/extension.ts
View file
Open in desktop
Expand Up @@ -11,10 +11,22 @@ let uris = {
let highlightingOn = true;

export function activate(context: vscode.ExtensionContext) {
let config = vscode.workspace.getConfiguration('ra-lsp');
if (config.has('highlightingOn')) {
highlightingOn = config.get('highlightingOn') as boolean;
}
let applyHighlightingOn = () => {
let config = vscode.workspace.getConfiguration('ra-lsp');
if (config.has('highlightingOn')) {
highlightingOn = config.get('highlightingOn') as boolean;
};

if (!highlightingOn) {
removeHighlights();
}
};

// Apply the highlightingOn config now and whenever the config changes
applyHighlightingOn();
vscode.workspace.onDidChangeConfiguration(_ => {
applyHighlightingOn();
});

let textDocumentContentProvider = new TextDocumentContentProvider()
let dispose = (disposable: vscode.Disposable) => {
Expand Down Expand Up @@ -130,7 +142,7 @@ export function activate(context: vscode.ExtensionContext) {
})
}, null, context.subscriptions)
vscode.window.onDidChangeActiveTextEditor(async (editor) => {
if (!editor || editor.document.languageId != 'rust') return
if (!highlightingOn || !editor || editor.document.languageId != 'rust') return
let params: lc.TextDocumentIdentifier = {
uri: editor.document.uri.toString()
}
Expand Down Expand Up @@ -179,7 +191,7 @@ function startServer() {
let editor = vscode.window.visibleTextEditors.find(
(editor) => editor.document.uri.toString() == params.uri
)
if (editor == null) return;
if (!highlightingOn || !editor) return;
setHighlights(
editor,
params.decorations,
Expand Down Expand Up @@ -213,10 +225,11 @@ class TextDocumentContentProvider implements vscode.TextDocumentContentProvider
}
}

let decorations: { [index: string]: vscode.TextEditorDecorationType } = {};

const decorations: { [index: string]: vscode.TextEditorDecorationType } = (() => {
function initDecorations() {
const decor = (obj: any) => vscode.window.createTextEditorDecorationType({ color: obj })
return {
decorations = {
background: decor("#3F3F3F"),
error: vscode.window.createTextEditorDecorationType({
borderColor: "red",
Expand All @@ -232,14 +245,26 @@ const decorations: { [index: string]: vscode.TextEditorDecorationType } = (() =>
attribute: decor("#BFEBBF"),
literal: decor("#DFAF8F"),
}
})()
}

function removeHighlights() {
for (let tag in decorations) {
decorations[tag].dispose();
}

decorations = {};
}

function setHighlights(
editor: vscode.TextEditor,
highlights: Array<Decoration>
) {
if (!highlightingOn) {
return;
// Initialize decorations if necessary
//
// Note: decoration objects need to be kept around so we can dispose them
// if the user disables syntax highlighting
if (Object.keys(decorations).length === 0) {
initDecorations();
}

let byTag: Map<string, vscode.Range[]> = new Map()
Expand Down