Skip to content

fix(editor): reload workspace configuration after change #7302

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
Boshen merged 2 commits into from
Nov 16, 2024
Merged

fix(editor): reload workspace configuration after change #7302

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e78304e
fix(editor): reset workspace configuration after change
Sysix Nov 15, 2024
7145486
[autofix.ci] apply automated fixes
autofix-ci[bot] Nov 15, 2024
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
33 changes: 17 additions & 16 deletions editors/vscode/client/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,19 @@ import { IDisposable } from './types';
export class ConfigService implements Config, IDisposable {
private static readonly _namespace = 'oxc';
private readonly _disposables: IDisposable[] = [];
private _inner: WorkspaceConfiguration;
private _runTrigger: Trigger;
private _enable: boolean;
private _trace: TraceLevel;
private _configPath: string;
private _inner!: WorkspaceConfiguration;
private _runTrigger!: Trigger;
private _enable!: boolean;
private _trace!: TraceLevel;
private _configPath!: string;
private _binPath: string | undefined;

public onConfigChange:
| ((this: ConfigService, config: ConfigurationChangeEvent) => void)
| undefined;

constructor() {
this._inner = workspace.getConfiguration(ConfigService._namespace);
this._runTrigger = this._inner.get<Trigger>('lint.run') || 'onType';
this._enable = this._inner.get<boolean>('enable') ?? true;
this._trace = this._inner.get<TraceLevel>('trace.server') || 'off';
this._configPath = this._inner.get<string>('configPath') || '.eslintrc';
this._binPath = this._inner.get<string>('path.server');
this.setSettingsFromWorkspace();
this.onConfigChange = undefined;

const disposeChangeListener = workspace.onDidChangeConfiguration(
Expand All @@ -30,6 +25,16 @@ export class ConfigService implements Config, IDisposable {
this._disposables.push(disposeChangeListener);
}

private setSettingsFromWorkspace(): void {
this._inner = workspace.getConfiguration(ConfigService._namespace);

this._runTrigger = this._inner.get<Trigger>('lint.run') || 'onType';
this._enable = this._inner.get<boolean>('enable') ?? true;
this._trace = this._inner.get<TraceLevel>('trace.server') || 'off';
this._configPath = this._inner.get<string>('configPath') || '.eslintrc';
this._binPath = this._inner.get<string>('path.server');
}

get runTrigger(): Trigger {
return this._runTrigger;
}
Expand Down Expand Up @@ -87,11 +92,7 @@ export class ConfigService implements Config, IDisposable {

private onVscodeConfigChange(event: ConfigurationChangeEvent): void {
if (event.affectsConfiguration(ConfigService._namespace)) {
this._runTrigger = this._inner.get<Trigger>('lint.run') || 'onType';
this._enable = this._inner.get<boolean>('enable') ?? true;
this._trace = this._inner.get<TraceLevel>('trace.server') || 'off';
this._configPath = this._inner.get<string>('configPath') || '.eslintrc';
this._binPath = this._inner.get<string>('path.server');
this.setSettingsFromWorkspace();
this.onConfigChange?.call(this, event);
}
}
Expand Down