Skip to content

Commit beefaee

Browse files
authored
fix lightbulb render location (microsoft#227138)
more lightbulb bugfixes
1 parent f858b32 commit beefaee

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

src/vs/editor/contrib/codeAction/browser/lightBulbWidget.ts

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,14 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
7575
private _gutterState: LightBulbState.State = LightBulbState.Hidden;
7676
private _iconClasses: string[] = [];
7777

78+
private readonly lightbulbClasses = [
79+
'codicon-' + GUTTER_LIGHTBULB_ICON.id,
80+
'codicon-' + GUTTER_LIGHTBULB_AIFIX_AUTO_FIX_ICON.id,
81+
'codicon-' + GUTTER_LIGHTBULB_AUTO_FIX_ICON.id,
82+
'codicon-' + GUTTER_LIGHTBULB_AIFIX_ICON.id,
83+
'codicon-' + GUTTER_SPARKLE_FILLED_ICON.id
84+
];
85+
7886
private _preferredKbLabel?: string;
7987
private _quickFixKbLabel?: string;
8088

@@ -148,15 +156,8 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
148156
}));
149157

150158
this._register(this._editor.onMouseDown(async (e: IEditorMouseEvent) => {
151-
const lightbulbClasses = [
152-
'codicon-' + GUTTER_LIGHTBULB_ICON.id,
153-
'codicon-' + GUTTER_LIGHTBULB_AIFIX_AUTO_FIX_ICON.id,
154-
'codicon-' + GUTTER_LIGHTBULB_AUTO_FIX_ICON.id,
155-
'codicon-' + GUTTER_LIGHTBULB_AIFIX_ICON.id,
156-
'codicon-' + GUTTER_SPARKLE_FILLED_ICON.id
157-
];
158-
159-
if (!e.target.element || !lightbulbClasses.some(cls => e.target.element && e.target.element.classList.contains(cls))) {
159+
160+
if (!e.target.element || !this.lightbulbClasses.some(cls => e.target.element && e.target.element.classList.contains(cls))) {
160161
return;
161162
}
162163

@@ -247,7 +248,9 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
247248
let hasDecoration = false;
248249
if (currLineDecorations) {
249250
for (const decoration of currLineDecorations) {
250-
if (decoration.options.glyphMarginClassName) {
251+
const glyphClass = decoration.options.glyphMarginClassName;
252+
253+
if (glyphClass && !this.lightbulbClasses.some(className => glyphClass.includes(className))) {
251254
hasDecoration = true;
252255
break;
253256
}

0 commit comments

Comments
 (0)