Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix for #241866 in main (#242294)

Browse Source
This commit is contained in:
Henning Dieterichs
2025-02-28 12:40:17 +01:00
committed by GitHub
parent 79570ba3fd
commit 4cf2712386
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts
+15 -1
View File
@@ -5,24 +5,29 @@
import { localize } from '../../../../nls.js';
import { createHotClass } from '../../../../base/common/hotReloadHelpers.js';
import { Disposable } from '../../../../base/common/lifecycle.js';
import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
import { autorunWithStore, derived } from '../../../../base/common/observable.js';
import { debouncedObservable } from '../../../../base/common/observableInternal/utils.js';
import Severity from '../../../../base/common/severity.js';
import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
import { InlineCompletionsController } from '../../../../editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.js';
import { ILanguageStatusService } from '../../../services/languageStatus/common/languageStatusService.js';
import { observableCodeEditor } from '../../../../editor/browser/observableCodeEditor.js';
export class InlineCompletionLanguageStatusBarContribution extends Disposable {
public static readonly hot = createHotClass(InlineCompletionLanguageStatusBarContribution);
public static Id = 'vs.editor.contrib.inlineCompletionLanguageStatusBarContribution';
public static readonly languageStatusBarDisposables = new Set<DisposableStore>();
private readonly _c = InlineCompletionsController.get(this._editor);
private readonly _state = derived(this, reader => {
const model = this._c?.model.read(reader);
if (!model) { return undefined; }
if (!observableCodeEditor(this._editor).isFocused.read(reader)) {
return undefined;
}
return {
model,
@@ -51,6 +56,15 @@ export class InlineCompletionLanguageStatusBarContribution extends Disposable {
noSuggestion: { shortLabel: '$(circle-slash)', label: '$(copilot) ' + localize('noInlineSuggestionAvailable', "No inline suggestion available"), loading: false, },
};
// Make sure previous status is cleared before the new is registered. This works, but is a bit hacky.
// TODO: Use a workbench contribution to get singleton behavior.
InlineCompletionLanguageStatusBarContribution.languageStatusBarDisposables.forEach(d => d.clear());
InlineCompletionLanguageStatusBarContribution.languageStatusBarDisposables.add(store);
store.add({
dispose: () => InlineCompletionLanguageStatusBarContribution.languageStatusBarDisposables.delete(store)
});
store.add(this._languageStatusService.addStatus({
accessibilityInfo: undefined,
busy: statusMap[status].loading,