Skip to content

Fix routine location status bar item flickering while typing #1590

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
merged 1 commit into from
Jun 25, 2025
Merged

Fix routine location status bar item flickering while typing #1590

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
56 changes: 27 additions & 29 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1440,39 +1440,33 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
}),
vscode.window.onDidChangeActiveTextEditor(async (textEditor: vscode.TextEditor) => {
if (!textEditor) return;
posPanel.text = "";
await checkConnection(false, textEditor.document.uri);
if (textEditor.document.uri.path.toLowerCase().endsWith(".xml") && config("autoPreviewXML")) {
return previewXMLAsUDL(textEditor, true);
}
}),
vscode.window.onDidChangeTextEditorSelection((event: vscode.TextEditorSelectionChangeEvent) => {
vscode.window.onDidChangeTextEditorSelection(async (event: vscode.TextEditorSelectionChangeEvent) => {
const document = event.textEditor.document;

// Avoid losing position indicator if event came from output channel
if (document.uri.scheme == "output") {
return;
}
posPanel.text = "";
if (![macLangId, intLangId].includes(document.languageId)) {
return;
}
if (event.selections.length > 1 || !event.selections[0].isEmpty) {
return;
}

const file = currentFile(document);
const nameMatch = file.name.match(/(.*)\.(int|mac)$/i);
if (!nameMatch) {
return;
}
const [, routine] = nameMatch;
let label = "";
let pos = 0;
vscode.commands
.executeCommand<vscode.DocumentSymbol[]>("vscode.executeDocumentSymbolProvider", document.uri)
.then((symbols) => {
if (symbols != undefined) {
// Avoid losing position indicator if event came from output channel or a non-active editor
if (document.uri.scheme == "output" || vscode.window.activeTextEditor != event.textEditor) return;
try {
if (
![macLangId, intLangId].includes(document.languageId) ||
event.selections.length > 1 ||
!event.selections[0].isEmpty
) {
throw undefined;
}
const file = currentFile(document);
const nameMatch = file.name.match(/(.*)\.(int|mac)$/i);
if (!nameMatch) throw undefined;
const [, routine] = nameMatch;
let label = "";
let pos = 0;
await vscode.commands
.executeCommand<vscode.DocumentSymbol[]>("vscode.executeDocumentSymbolProvider", document.uri)
.then((symbols) => {
if (!symbols) throw undefined;
const cursor = event.selections[0].active;
if (symbols.length == 0 || cursor.isBefore(symbols[0].range.start)) {
pos = cursor.line - 1;
Expand All @@ -1486,8 +1480,12 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
}
}
posPanel.text = `${label}${pos > 0 ? "+" + pos : ""}^${routine}`;
}
});
});
} catch {
// If we couldn't resolve the cursor location to a label+offset^routine
// for any reason, hide the status bar item
posPanel.text = "";
}
}),
vscode.commands.registerCommand("vscode-objectscript.loadStudioSnippets", loadStudioSnippets),
vscode.commands.registerCommand("vscode-objectscript.loadStudioColors", () => {
Expand Down