Skip to content

Commit 13a80e0

Browse files
authored
Last pass using ?.() for method call (microsoft#152231)
Follow up on f17b33f This handles sightly more complex cases, changing: ```ts if (a) { a.b.c(); } ``` to: ```ts a?.b.c(); ```
1 parent 38bdf5a commit 13a80e0

File tree

25 files changed

+34
-102
lines changed

25 files changed

+34
-102
lines changed

src/vs/base/browser/ui/actionbar/actionViewItems.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,7 @@ export class ActionViewItem extends BaseActionViewItem {
367367

368368
this.updateEnabled();
369369
} else {
370-
if (this.label) {
371-
this.label.classList.remove('codicon');
372-
}
370+
this.label?.classList.remove('codicon');
373371
}
374372
}
375373

@@ -380,18 +378,14 @@ export class ActionViewItem extends BaseActionViewItem {
380378
this.label.classList.remove('disabled');
381379
}
382380

383-
if (this.element) {
384-
this.element.classList.remove('disabled');
385-
}
381+
this.element?.classList.remove('disabled');
386382
} else {
387383
if (this.label) {
388384
this.label.setAttribute('aria-disabled', 'true');
389385
this.label.classList.add('disabled');
390386
}
391387

392-
if (this.element) {
393-
this.element.classList.add('disabled');
394-
}
388+
this.element?.classList.add('disabled');
395389
}
396390
}
397391

src/vs/base/browser/ui/dialog/dialog.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,9 +427,7 @@ export class Dialog extends Disposable {
427427
this.element.style.backgroundColor = bgColor?.toString() ?? '';
428428
this.element.style.border = border;
429429

430-
if (this.buttonBar) {
431-
this.buttonBar.buttons.forEach(button => button.style(style));
432-
}
430+
this.buttonBar?.buttons.forEach(button => button.style(style));
433431

434432
this.checkbox?.style(style);
435433

src/vs/base/browser/ui/list/listView.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,19 +1110,15 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
11101110
const item = this.items[index]!;
11111111
item.dropTarget = true;
11121112

1113-
if (item.row) {
1114-
item.row.domNode.classList.add('drop-target');
1115-
}
1113+
item.row?.domNode.classList.add('drop-target');
11161114
}
11171115

11181116
this.currentDragFeedbackDisposable = toDisposable(() => {
11191117
for (const index of feedback) {
11201118
const item = this.items[index]!;
11211119
item.dropTarget = false;
11221120

1123-
if (item.row) {
1124-
item.row.domNode.classList.remove('drop-target');
1125-
}
1121+
item.row?.domNode.classList.remove('drop-target');
11261122
}
11271123
});
11281124
}

src/vs/base/browser/ui/menu/menubar.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -956,9 +956,7 @@ export class MenuBar extends Disposable {
956956
}
957957

958958
if (this.focusedMenu.holder) {
959-
if (this.focusedMenu.holder.parentElement) {
960-
this.focusedMenu.holder.parentElement.classList.remove('open');
961-
}
959+
this.focusedMenu.holder.parentElement?.classList.remove('open');
962960

963961
this.focusedMenu.holder.remove();
964962
}

src/vs/base/browser/ui/splitview/paneview.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,7 @@ export abstract class Pane extends Disposable implements IView {
143143
return false;
144144
}
145145

146-
if (this.element) {
147-
this.element.classList.toggle('expanded', expanded);
148-
}
146+
this.element?.classList.toggle('expanded', expanded);
149147

150148
this._expanded = !!expanded;
151149
this.updateHeader();

src/vs/code/electron-sandbox/issue/issueReporterMain.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,12 +1204,8 @@ export class IssueReporter extends Disposable {
12041204
// helper functions
12051205

12061206
function hide(el: Element | undefined | null) {
1207-
if (el) {
1208-
el.classList.add('hidden');
1209-
}
1207+
el?.classList.add('hidden');
12101208
}
12111209
function show(el: Element | undefined | null) {
1212-
if (el) {
1213-
el.classList.remove('hidden');
1214-
}
1210+
el?.classList.remove('hidden');
12151211
}

src/vs/editor/browser/widget/codeEditorWidget.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -588,9 +588,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
588588
}
589589

590590
public setHiddenAreas(ranges: IRange[]): void {
591-
if (this._modelData) {
592-
this._modelData.viewModel.setHiddenAreas(ranges.map(r => Range.lift(r)));
593-
}
591+
this._modelData?.viewModel.setHiddenAreas(ranges.map(r => Range.lift(r)));
594592
}
595593

596594
public getVisibleColumnFromPosition(rawPosition: IPosition): number {

src/vs/editor/contrib/documentSymbols/browser/outlineModel.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ export abstract class TreeElement {
3030
abstract parent: TreeElement | undefined;
3131

3232
remove(): void {
33-
if (this.parent) {
34-
this.parent.children.delete(this.id);
35-
}
33+
this.parent?.children.delete(this.id);
3634
}
3735

3836
static findId(candidate: DocumentSymbol | string, container: TreeElement): string {

src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,7 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
159159
this.keyVisible.set(true);
160160
this.visible = true;
161161
setTimeout(() => {
162-
if (this.domNodes) {
163-
this.domNodes.element.classList.add('visible');
164-
}
162+
this.domNodes?.element.classList.add('visible');
165163
}, 100);
166164
this.editor.layoutContentWidget(this);
167165
}
@@ -176,9 +174,7 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
176174
this.keyVisible.reset();
177175
this.visible = false;
178176
this.announcedLabel = null;
179-
if (this.domNodes) {
180-
this.domNodes.element.classList.remove('visible');
181-
}
177+
this.domNodes?.element.classList.remove('visible');
182178
this.editor.layoutContentWidget(this);
183179
}
184180

src/vs/platform/issue/electron-main/issueMainService.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,7 @@ export class IssueMainService implements ICommonIssueService {
168168
throw new Error(`Unexpected command source: ${from}`);
169169
}
170170

171-
if (parentWindow) {
172-
parentWindow.webContents.send('vscode:runAction', { id, from, args });
173-
}
171+
parentWindow?.webContents.send('vscode:runAction', { id, from, args });
174172
});
175173

176174
validatedIpcMain.on('vscode:openExternal', (_: unknown, arg: string) => {

0 commit comments

Comments
 (0)