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

Make SwitchHeaderSource use workbench.editor.revealIfOpen setting #8857

Merged
merged 10 commits into from
Feb 18, 2022
Merged

Make SwitchHeaderSource use workbench.editor.revealIfOpen setting #8857

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
49e9871
Add setting for SwitchHeaderSource UI behavior
joelmsmith Feb 13, 2022
378522d
PR feedback: revert unneeded changes to client.ts
joelmsmith Feb 15, 2022
5e4c25b
Merge branch 'main' into updateSwitchHeaderSource
sean-mcmanus Feb 15, 2022
e858dde
PR feedback: fix error in package.json
joelmsmith Feb 15, 2022
ece1988
Merge branch 'updateSwitchHeaderSource' of github.com:joelmsmith/vsco…
joelmsmith Feb 15, 2022
ad31dab
Merge remote-tracking branch 'origin/main' into updateSwitchHeaderSource
joelmsmith Feb 17, 2022
0c0d74b
Use workbench.editor.revealIfOpen
joelmsmith Feb 17, 2022
4704a7b
PR feedback: consolidate lambda
joelmsmith Feb 18, 2022
572a10c
Fix build: add typedef for workbenchConfig
joelmsmith Feb 18, 2022
2a6535e
Merge branch 'main' into updateSwitchHeaderSource
sean-mcmanus Feb 18, 2022
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
18 changes: 11 additions & 7 deletions Extension/src/LanguageServer/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,14 +484,18 @@ async function onSwitchHeaderSource(): Promise<void> {
}
});
const document: vscode.TextDocument = await vscode.workspace.openTextDocument(targetFileName);
const workbenchConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("workbench");
let foundEditor: boolean = false;
// If the document is already visible in another column, open it there.
vscode.window.visibleTextEditors.forEach((editor, index, array) => {
if (editor.document === document && !foundEditor) {
foundEditor = true;
vscode.window.showTextDocument(document, editor.viewColumn);
}
});
if (workbenchConfig.get("editor.revealIfOpen")) {
// If the document is already visible in another column, open it there.
vscode.window.visibleTextEditors.forEach(editor => {
if (editor.document === document && !foundEditor) {
foundEditor = true;
vscode.window.showTextDocument(document, editor.viewColumn);
}
});
}

if (!foundEditor) {
vscode.window.showTextDocument(document);
}
Expand Down