Skip to content

Commit a458da4

Browse files
committed
Clear tsignores under extensions folder #37212
1 parent ea5d706 commit a458da4

File tree

6 files changed

+18
-96
lines changed

6 files changed

+18
-96
lines changed

src/vs/workbench/parts/extensions/browser/extensionEditor.ts

+4-35
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,19 @@ import Cache from 'vs/base/common/cache';
1717
import { Action } from 'vs/base/common/actions';
1818
import { isPromiseCanceledError } from 'vs/base/common/errors';
1919
import Severity from 'vs/base/common/severity';
20-
import { IDisposable, empty, dispose, toDisposable } from 'vs/base/common/lifecycle';
20+
import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
2121
import { Builder } from 'vs/base/browser/builder';
2222
import { domEvent } from 'vs/base/browser/event';
2323
import { append, $, addClass, removeClass, finalHandler, join } from 'vs/base/browser/dom';
2424
import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
2525
import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
2626
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
2727
import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
28-
import { IExtensionGalleryService, IExtensionManifest, IKeyBinding, IView, IExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionManagement';
28+
import { IExtensionManifest, IKeyBinding, IView, IExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionManagement';
2929
import { ResolvedKeybinding, KeyMod, KeyCode } from 'vs/base/common/keyCodes';
3030
import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
3131
import { IExtensionsWorkbenchService, IExtensionsViewlet, VIEWLET_ID, IExtension, IExtensionDependencies } from 'vs/workbench/parts/extensions/common/extensions';
3232
import { Renderer, DataSource, Controller } from 'vs/workbench/parts/extensions/browser/dependenciesViewer';
33-
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
34-
import { ITemplateData } from 'vs/workbench/parts/extensions/browser/extensionsList';
3533
import { RatingsWidget, InstallWidget } from 'vs/workbench/parts/extensions/browser/extensionsWidgets';
3634
import { EditorOptions } from 'vs/workbench/common/editor';
3735
import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
@@ -165,10 +163,6 @@ export class ExtensionEditor extends BaseEditor {
165163
private content: HTMLElement;
166164
private recommendation: HTMLElement;
167165
private header: HTMLElement;
168-
// @ts-ignore unused property
169-
private _highlight: ITemplateData;
170-
// @ts-ignore unused property
171-
private highlightDisposable: IDisposable;
172166

173167
private extensionReadme: Cache<string>;
174168
private extensionChangelog: Cache<string>;
@@ -185,10 +179,6 @@ export class ExtensionEditor extends BaseEditor {
185179

186180
constructor(
187181
@ITelemetryService telemetryService: ITelemetryService,
188-
// @ts-ignore unused injected service
189-
@IExtensionGalleryService private galleryService: IExtensionGalleryService,
190-
// @ts-ignore unused injected service
191-
@IConfigurationService private configurationService: IConfigurationService,
192182
@IInstantiationService private instantiationService: IInstantiationService,
193183
@IViewletService private viewletService: IViewletService,
194184
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
@@ -199,20 +189,17 @@ export class ExtensionEditor extends BaseEditor {
199189
@IListService private listService: IListService,
200190
@IPartService private partService: IPartService,
201191
@IContextViewService private contextViewService: IContextViewService,
202-
// @ts-ignore unused injected service
203192
@IContextKeyService private contextKeyService: IContextKeyService,
204193
@IExtensionTipsService private extensionTipsService: IExtensionTipsService
205194
) {
206195
super(ExtensionEditor.ID, telemetryService, themeService);
207-
this._highlight = null;
208-
this.highlightDisposable = empty;
209196
this.disposables = [];
210197
this.extensionReadme = null;
211198
this.extensionChangelog = null;
212199
this.extensionManifest = null;
213200
this.extensionDependencies = null;
214-
this.contextKey = KEYBINDING_CONTEXT_EXTENSIONEDITOR_WEBVIEW_FOCUS.bindTo(contextKeyService);
215-
this.findInputFocusContextKey = KEYBINDING_CONTEXT_EXTENSIONEDITOR_FIND_WIDGET_INPUT_FOCUSED.bindTo(contextKeyService);
201+
this.contextKey = KEYBINDING_CONTEXT_EXTENSIONEDITOR_WEBVIEW_FOCUS.bindTo(this.contextKeyService);
202+
this.findInputFocusContextKey = KEYBINDING_CONTEXT_EXTENSIONEDITOR_FIND_WIDGET_INPUT_FOCUSED.bindTo(this.contextKeyService);
216203
}
217204

218205
createEditor(parent: Builder): void {
@@ -900,7 +887,6 @@ export class ExtensionEditor extends BaseEditor {
900887
}
901888

902889
dispose(): void {
903-
this._highlight = null;
904890
this.transientDisposables = dispose(this.transientDisposables);
905891
this.disposables = dispose(this.disposables);
906892
super.dispose();
@@ -932,23 +918,6 @@ const showCommand = new ShowExtensionEditorFindCommand({
932918
});
933919
KeybindingsRegistry.registerCommandAndKeybindingRule(showCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
934920

935-
// @ts-ignore unused type
936-
class HideExtensionEditorFindCommand extends Command {
937-
public runCommand(accessor: ServicesAccessor, args: any): void {
938-
const extensionEditor = this.getExtensionEditor(accessor);
939-
if (extensionEditor) {
940-
extensionEditor.hideFind();
941-
}
942-
}
943-
944-
private getExtensionEditor(accessor: ServicesAccessor): ExtensionEditor {
945-
const activeEditor = accessor.get(IWorkbenchEditorService).getActiveEditor() as ExtensionEditor;
946-
if (activeEditor instanceof ExtensionEditor) {
947-
return activeEditor;
948-
}
949-
return null;
950-
}
951-
}
952921
const hideCommand = new ShowExtensionEditorFindCommand({
953922
id: 'editor.action.extensioneditor.hidefind',
954923
precondition: KEYBINDING_CONTEXT_EXTENSIONEDITOR_WEBVIEW_FOCUS,

src/vs/workbench/parts/extensions/browser/extensionsActions.ts

+11-41
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,7 @@ export class UninstallAction extends Action {
110110
set extension(extension: IExtension) { this._extension = extension; this.update(); }
111111

112112
constructor(
113-
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
114-
// @ts-ignore unused injected service
115-
@IMessageService private messageService: IMessageService,
116-
// @ts-ignore unused injected service
117-
@IInstantiationService private instantiationService: IInstantiationService
113+
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
118114
) {
119115
super('extensions.uninstall', UninstallAction.UninstallLabel, UninstallAction.UninstallClass, false);
120116

@@ -365,11 +361,7 @@ export class ManageExtensionAction extends Action {
365361
set extension(extension: IExtension) { this._extension = extension; this._actionItem.extension = extension; this.update(); }
366362

367363
constructor(
368-
// @ts-ignore unused injected service
369-
@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
370364
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
371-
// @ts-ignore unused injected service
372-
@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService,
373365
@IInstantiationService private instantiationService: IInstantiationService
374366
) {
375367
super(ManageExtensionAction.ID);
@@ -430,9 +422,7 @@ export class EnableForWorkspaceAction extends Action implements IExtensionAction
430422
constructor(label: string,
431423
@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
432424
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
433-
@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService,
434-
// @ts-ignore unused injected service
435-
@IInstantiationService private instantiationService: IInstantiationService
425+
@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
436426
) {
437427
super(EnableForWorkspaceAction.ID, label);
438428

@@ -471,9 +461,7 @@ export class EnableGloballyAction extends Action implements IExtensionAction {
471461

472462
constructor(label: string,
473463
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
474-
@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService,
475-
// @ts-ignore unused injected service
476-
@IInstantiationService private instantiationService: IInstantiationService
464+
@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
477465
) {
478466
super(EnableGloballyAction.ID, label);
479467

@@ -569,9 +557,7 @@ export class DisableForWorkspaceAction extends Action implements IExtensionActio
569557

570558
constructor(label: string,
571559
@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
572-
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
573-
// @ts-ignore unused injected service
574-
@IInstantiationService private instantiationService: IInstantiationService
560+
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
575561
) {
576562
super(DisableForWorkspaceAction.ID, label);
577563

@@ -609,9 +595,7 @@ export class DisableGloballyAction extends Action implements IExtensionAction {
609595
set extension(extension: IExtension) { this._extension = extension; this.update(); }
610596

611597
constructor(label: string,
612-
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
613-
// @ts-ignore unused injected service
614-
@IInstantiationService private instantiationService: IInstantiationService
598+
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
615599
) {
616600
super(DisableGloballyAction.ID, label);
617601

@@ -810,8 +794,6 @@ export class ReloadAction extends Action {
810794

811795
constructor(
812796
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
813-
// @ts-ignore unused injected service
814-
@IMessageService private messageService: IMessageService,
815797
@IWindowService private windowService: IWindowService,
816798
@IExtensionService private extensionService: IExtensionService
817799
) {
@@ -919,9 +901,7 @@ export class ShowEnabledExtensionsAction extends Action {
919901
constructor(
920902
id: string,
921903
label: string,
922-
@IViewletService private viewletService: IViewletService,
923-
// @ts-ignore unused injected service
924-
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
904+
@IViewletService private viewletService: IViewletService
925905
) {
926906
super(id, label, 'clear-extensions', true);
927907
}
@@ -944,9 +924,7 @@ export class ShowInstalledExtensionsAction extends Action {
944924
constructor(
945925
id: string,
946926
label: string,
947-
@IViewletService private viewletService: IViewletService,
948-
// @ts-ignore unused injected service
949-
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
927+
@IViewletService private viewletService: IViewletService
950928
) {
951929
super(id, label, 'clear-extensions', true);
952930
}
@@ -969,9 +947,7 @@ export class ShowDisabledExtensionsAction extends Action {
969947
constructor(
970948
id: string,
971949
label: string,
972-
@IViewletService private viewletService: IViewletService,
973-
// @ts-ignore unused injected service
974-
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
950+
@IViewletService private viewletService: IViewletService
975951
) {
976952
super(id, label, 'null', true);
977953
}
@@ -997,9 +973,7 @@ export class ClearExtensionsInputAction extends Action {
997973
id: string,
998974
label: string,
999975
onSearchChange: Event<string>,
1000-
@IViewletService private viewletService: IViewletService,
1001-
// @ts-ignore unused injected service
1002-
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
976+
@IViewletService private viewletService: IViewletService
1003977
) {
1004978
super(id, label, 'clear-extensions', true);
1005979
this.enabled = false;
@@ -1565,9 +1539,7 @@ export class DisableAllAction extends Action {
15651539

15661540
constructor(
15671541
id: string = DisableAllAction.ID, label: string = DisableAllAction.LABEL,
1568-
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
1569-
// @ts-ignore unused injected service
1570-
@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
1542+
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
15711543
) {
15721544
super(id, label);
15731545
this.update();
@@ -1598,9 +1570,7 @@ export class DisableAllWorkpsaceAction extends Action {
15981570
constructor(
15991571
id: string = DisableAllWorkpsaceAction.ID, label: string = DisableAllWorkpsaceAction.LABEL,
16001572
@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
1601-
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
1602-
// @ts-ignore unused injected service
1603-
@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
1573+
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
16041574
) {
16051575
super(id, label);
16061576
this.update();

src/vs/workbench/parts/extensions/browser/extensionsList.ts

-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import { InstallAction, UpdateAction, BuiltinStatusLabelAction, ManageExtensionA
2020
import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
2121
import { Label, RatingsWidget, InstallWidget } from 'vs/workbench/parts/extensions/browser/extensionsWidgets';
2222
import { EventType } from 'vs/base/common/events';
23-
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
2423
import { IExtensionService } from 'vs/platform/extensions/common/extensions';
2524
import { IExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionManagement';
2625
import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -50,8 +49,6 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
5049

5150
constructor(
5251
@IInstantiationService private instantiationService: IInstantiationService,
53-
// @ts-ignore unused injected service
54-
@IContextMenuService private contextMenuService: IContextMenuService,
5552
@IMessageService private messageService: IMessageService,
5653
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
5754
@IExtensionService private extensionService: IExtensionService,

src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,8 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
8585
@IInstantiationService instantiationService: IInstantiationService,
8686
@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
8787
@IEditorGroupService private editorInputService: IEditorGroupService,
88-
// @ts-ignore unused injected service
89-
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
9088
@IExtensionManagementService private extensionManagementService: IExtensionManagementService,
9189
@IMessageService private messageService: IMessageService,
92-
// @ts-ignore unused injected service
9390
@IViewletService private viewletService: IViewletService,
9491
@IThemeService themeService: IThemeService,
9592
@IConfigurationService private configurationService: IConfigurationService,
@@ -108,7 +105,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
108105
this.searchInstalledExtensionsContextKey = SearchInstalledExtensionsContext.bindTo(contextKeyService);
109106
this.recommendedExtensionsContextKey = RecommendedExtensionsContext.bindTo(contextKeyService);
110107

111-
this.disposables.push(viewletService.onDidViewletOpen(this.onViewletOpen, this, this.disposables));
108+
this.disposables.push(this.viewletService.onDidViewletOpen(this.onViewletOpen, this, this.disposables));
112109

113110
this.configurationService.onDidChangeConfiguration(e => {
114111
if (e.affectsConfiguration(AutoUpdateConfigurationKey)) {

src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts

+1-10
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ import { SortBy, SortOrder, IQueryOptions, LocalExtensionType, IExtensionTipsSer
1818
import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
1919
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
2020
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
21-
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
22-
import { ICommandService } from 'vs/platform/commands/common/commands';
2321
import { append, $, toggleClass } from 'vs/base/browser/dom';
2422
import { PagedList } from 'vs/base/browser/ui/list/listPaging';
2523
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -36,7 +34,6 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi
3634
import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
3735
import { IModeService } from 'vs/editor/common/services/modeService';
3836
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
39-
import { IProgressService } from 'vs/platform/progress/common/progress';
4037
import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
4138
import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
4239
import { EventType } from 'vs/base/common/events';
@@ -58,19 +55,13 @@ export class ExtensionsListView extends ViewsViewletPanel {
5855
@IInstantiationService protected instantiationService: IInstantiationService,
5956
@IListService private listService: IListService,
6057
@IThemeService private themeService: IThemeService,
61-
// @ts-ignore unused injected service
62-
@IContextKeyService private contextKeyService: IContextKeyService,
6358
@IExtensionService private extensionService: IExtensionService,
64-
// @ts-ignore unused injected service
65-
@ICommandService private commandService: ICommandService,
6659
@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
6760
@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
6861
@IEditorGroupService private editorInputService: IEditorGroupService,
6962
@IExtensionTipsService private tipsService: IExtensionTipsService,
7063
@IModeService private modeService: IModeService,
71-
@ITelemetryService private telemetryService: ITelemetryService,
72-
// @ts-ignore unused injected service
73-
@IProgressService private progressService: IProgressService
64+
@ITelemetryService private telemetryService: ITelemetryService
7465
) {
7566
super({ ...(options as IViewOptions), ariaHeaderLabel: options.name }, keybindingService, contextMenuService);
7667
}

src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { IPager, mapPager, singlePagePager } from 'vs/base/common/paging';
2020
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
2121
import {
2222
IExtensionManagementService, IExtensionGalleryService, ILocalExtension, IGalleryExtension, IQueryOptions, IExtensionManifest,
23-
InstallExtensionEvent, DidInstallExtensionEvent, LocalExtensionType, DidUninstallExtensionEvent, IExtensionEnablementService, IExtensionTipsService, IExtensionIdentifier
23+
InstallExtensionEvent, DidInstallExtensionEvent, LocalExtensionType, DidUninstallExtensionEvent, IExtensionEnablementService, IExtensionIdentifier
2424
} from 'vs/platform/extensionManagement/common/extensionManagement';
2525
import { getGalleryExtensionIdFromLocal, getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
2626
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -332,8 +332,6 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
332332
@IChoiceService private choiceService: IChoiceService,
333333
@IURLService urlService: IURLService,
334334
@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService,
335-
// @ts-ignore unused injected service
336-
@IExtensionTipsService private tipsService: IExtensionTipsService,
337335
@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
338336
@IWindowService private windowService: IWindowService
339337
) {

0 commit comments

Comments
 (0)