Skip to content

Commit 7f2a8ec

Browse files
committed
More carefully check when to prompt user to restart
1 parent 7e70093 commit 7f2a8ec

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

apps/vscode/src/main.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import * as vscode from "vscode";
1717
import * as path from "path";
18+
import { tryAcquirePositronApi } from "@posit-dev/positron";
1819
import { MarkdownEngine } from "./markdown/engine";
1920
import { kQuartoDocSelector } from "./core/doc";
2021
import { activateLsp, deactivate as deactivateLsp } from "./lsp/client";
@@ -139,10 +140,15 @@ export async function activate(context: vscode.ExtensionContext) {
139140
* Register a listener for changes to Quarto path settings that require a restart
140141
*/
141142
function registerQuartoPathConfigListener(context: vscode.ExtensionContext, outputChannel: vscode.LogOutputChannel) {
143+
// Check if we're in Positron
144+
const isPositron = tryAcquirePositronApi();
145+
142146
// List of settings that require restart when changed
143147
const quartoPathSettings = [
144148
"quarto.path",
145149
"quarto.usePipQuarto",
150+
];
151+
const positronPathSettings = [
146152
"quarto.useBundledQuartoInPositron"
147153
];
148154

@@ -151,8 +157,9 @@ function registerQuartoPathConfigListener(context: vscode.ExtensionContext, outp
151157
vscode.workspace.onDidChangeConfiguration(event => {
152158
// Check if any of our path settings changed
153159
const requiresRestart = quartoPathSettings.some(setting => event.affectsConfiguration(setting));
160+
const requiresPositronRestart = isPositron && positronPathSettings.some(setting => event.affectsConfiguration(setting));
154161

155-
if (requiresRestart) {
162+
if (requiresRestart || requiresPositronRestart) {
156163
outputChannel.info(`Quarto path settings changed, restart required: ${quartoPathSettings.filter(setting =>
157164
event.affectsConfiguration(setting)).join(", ")}`);
158165

0 commit comments

Comments
 (0)