Skip to content

Commit 2eb5219

Browse files
committed
Remove temp fix for gotoLocation
1 parent bd056d5 commit 2eb5219

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

src/Providers/DefinitionProvider.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,11 @@ let previous: {
99
definitions: vscode.DefinitionLink[];
1010
};
1111

12-
export let gotoLocationsBroken = false;
13-
1412

1513
export const DefinitionProvider: vscode.DefinitionProvider = {
1614
async provideDefinition(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken): Promise<vscode.DefinitionLink[] | undefined> {
1715
// vscode.window.showInformationMessage(JSON.stringify("Definition"));
1816
// const start = performance.now();
19-
gotoLocationsBroken = true;
2017

2118
const uriString = document.uri.toString();
2219
if (previous &&

src/Providers/TreeDataProvider.ts

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { getScopes, getSubScope } from "../themeScopeColors";
1010
import { createOnigScanner, createOnigString, FindOption } from 'vscode-oniguruma';
1111
import { ruleIdToNumber } from "../textmate/rule";
1212
// import { ITextEditorOptions, EditorOpenSource, TextEditorSelectionSource } from "../extensions";
13-
import { gotoLocationsBroken } from "./DefinitionProvider";
1413

1514
type element = {
1615
type: 'file' | 'root' | 'line' | 'token' | 'scope' | 'rule' | 'regexes' | 'regex',
@@ -1147,13 +1146,13 @@ async function gotoGrammar(element: element) {
11471146
const uri = grammarDoc.uri;
11481147
const location = new vscode.Location(uri, range);
11491148
const locations = [location];
1150-
if (gotoLocationsBroken) {
1151-
const options: vscode.TextDocumentShowOptions = {
1152-
selection: range,
1153-
preview: true,
1154-
};
1155-
vscode.window.showTextDocument(grammarDoc, options);
1156-
}
1149+
// if (gotoLocationsBroken) {
1150+
// const options: vscode.TextDocumentShowOptions = {
1151+
// selection: range,
1152+
// preview: true,
1153+
// };
1154+
// vscode.window.showTextDocument(grammarDoc, options);
1155+
// }
11571156
vscode.commands.executeCommand('editor.action.goToLocations', uri, range.start, locations);
11581157
}
11591158

@@ -1229,13 +1228,13 @@ async function gotoFile(element: element) {
12291228
// selectionSource: TextEditorSelectionSource.NAVIGATION,
12301229
// };
12311230
// vscode.commands.executeCommand('vscode.open', document.uri, [start, textEditorOptions]);
1232-
if (gotoLocationsBroken) {
1233-
const options: vscode.TextDocumentShowOptions = {
1234-
selection: range,
1235-
preview: true,
1236-
};
1237-
vscode.window.showTextDocument(document, options);
1238-
}
1231+
// if (gotoLocationsBroken) {
1232+
// const options: vscode.TextDocumentShowOptions = {
1233+
// selection: range,
1234+
// preview: true,
1235+
// };
1236+
// vscode.window.showTextDocument(document, options);
1237+
// }
12391238
vscode.commands.executeCommand('editor.action.goToLocations', document.uri, position, [location]);
12401239
return;
12411240
}

0 commit comments

Comments
 (0)