Skip to content

Commit d697093

Browse files
jriekenjrieken
authored
Merge pull request #192200 from microsoft/joh/wilful-cougar
chore - avoid duplicate imports
2 parents a3d328a + d52c8b0 commit d697093

File tree

3 files changed

+17
-20
lines changed

3 files changed

+17
-20
lines changed

‎src/vs/base/browser/ui/grid/grid.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import { equals, tail2 as tail } from 'vs/base/common/arrays';
88
import { Event } from 'vs/base/common/event';
99
import { Disposable } from 'vs/base/common/lifecycle';
1010
import 'vs/css!./gridview';
11-
import { Box, GridView, IGridViewOptions, IGridViewStyles, IView as IGridViewView, IViewSize, orthogonal, Sizing as GridViewSizing } from './gridview';
12-
import type { GridLocation } from 'vs/base/browser/ui/grid/gridview';
11+
import { Box, GridView, IGridViewOptions, IGridViewStyles, IView as IGridViewView, IViewSize, orthogonal, Sizing as GridViewSizing, GridLocation } from './gridview';
1312
import type { SplitView, AutoSizing as SplitViewAutoSizing } from 'vs/base/browser/ui/splitview/splitview';
1413

1514
export { IViewSize, LayoutPriority, Orientation, orthogonal } from './gridview';

‎src/vs/editor/browser/viewParts/minimap/minimapCharRendererFactory.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { MinimapCharRenderer } from 'vs/editor/browser/viewParts/minimap/minimapCharRenderer';
7-
import { allCharCodes } from 'vs/editor/browser/viewParts/minimap/minimapCharSheet';
7+
import { allCharCodes, Constants } from 'vs/editor/browser/viewParts/minimap/minimapCharSheet';
88
import { prebakedMiniMaps } from 'vs/editor/browser/viewParts/minimap/minimapPreBaked';
9-
import { Constants } from './minimapCharSheet';
109
import { toUint8 } from 'vs/base/common/uint';
1110

1211
/**

‎src/vs/workbench/api/common/extHostTreeViews.ts

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import { localize } from 'vs/nls';
77
import type * as vscode from 'vscode';
8-
import * as types from './extHostTypes';
98
import { basename } from 'vs/base/common/resources';
109
import { URI } from 'vs/base/common/uri';
1110
import { Emitter, Event } from 'vs/base/common/event';
@@ -14,7 +13,7 @@ import { CheckboxUpdate, DataTransferDTO, ExtHostTreeViewsShape, MainThreadTreeV
1413
import { ITreeItem, TreeViewItemHandleArg, ITreeItemLabel, IRevealOptions, TreeCommand, TreeViewPaneHandleArg, ITreeItemCheckboxState, NoTreeViewError } from 'vs/workbench/common/views';
1514
import { ExtHostCommands, CommandsConverter } from 'vs/workbench/api/common/extHostCommands';
1615
import { asPromise } from 'vs/base/common/async';
17-
import { TreeItemCollapsibleState, TreeItemCheckboxState, ThemeIcon, MarkdownString as MarkdownStringType, TreeItem, ViewBadge as ExtHostViewBadge } from 'vs/workbench/api/common/extHostTypes';
16+
import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
1817
import { isUndefinedOrNull, isString } from 'vs/base/common/types';
1918
import { equals, coalesce } from 'vs/base/common/arrays';
2019
import { ILogService } from 'vs/platform/log/common/log';
@@ -134,7 +133,7 @@ export class ExtHostTreeViews implements ExtHostTreeViewsShape {
134133
return treeView.badge;
135134
},
136135
set badge(badge: vscode.ViewBadge | undefined) {
137-
if ((badge !== undefined) && ExtHostViewBadge.isViewBadge(badge)) {
136+
if ((badge !== undefined) && extHostTypes.ViewBadge.isViewBadge(badge)) {
138137
treeView.badge = {
139138
value: Math.floor(Math.abs(badge.value)),
140139
tooltip: badge.tooltip
@@ -203,7 +202,7 @@ export class ExtHostTreeViews implements ExtHostTreeViewsShape {
203202
return Promise.reject(new NoTreeViewError(sourceViewId));
204203
}
205204

206-
const treeDataTransfer = await this.addAdditionalTransferItems(new types.DataTransfer(), treeView, sourceTreeItemHandles, token, operationUuid);
205+
const treeDataTransfer = await this.addAdditionalTransferItems(new extHostTypes.DataTransfer(), treeView, sourceTreeItemHandles, token, operationUuid);
207206
if (!treeDataTransfer || token.isCancellationRequested) {
208207
return;
209208
}
@@ -514,21 +513,21 @@ class ExtHostTreeView<T> extends Disposable {
514513
}
515514

516515
async setCheckboxState(checkboxUpdates: CheckboxUpdate[]) {
517-
type CheckboxUpdateWithItem = { extensionItem: NonNullable<T>; treeItem: vscode.TreeItem; newState: TreeItemCheckboxState };
516+
type CheckboxUpdateWithItem = { extensionItem: NonNullable<T>; treeItem: vscode.TreeItem; newState: extHostTypes.TreeItemCheckboxState };
518517
const items = (await Promise.all(checkboxUpdates.map(async checkboxUpdate => {
519518
const extensionItem = this.getExtensionElement(checkboxUpdate.treeItemHandle);
520519
if (extensionItem) {
521520
return {
522521
extensionItem: extensionItem,
523522
treeItem: await this.dataProvider.getTreeItem(extensionItem),
524-
newState: checkboxUpdate.newState ? TreeItemCheckboxState.Checked : TreeItemCheckboxState.Unchecked
523+
newState: checkboxUpdate.newState ? extHostTypes.TreeItemCheckboxState.Checked : extHostTypes.TreeItemCheckboxState.Unchecked
525524
};
526525
}
527526
return Promise.resolve(undefined);
528527
}))).filter<CheckboxUpdateWithItem>((item): item is CheckboxUpdateWithItem => item !== undefined);
529528

530529
items.forEach(item => {
531-
item.treeItem.checkboxState = item.newState ? TreeItemCheckboxState.Checked : TreeItemCheckboxState.Unchecked;
530+
item.treeItem.checkboxState = item.newState ? extHostTypes.TreeItemCheckboxState.Checked : extHostTypes.TreeItemCheckboxState.Unchecked;
532531
});
533532

534533
this._onDidChangeCheckboxState.fire({ items: items.map(item => [item.extensionItem, item.newState]) });
@@ -767,7 +766,7 @@ class ExtHostTreeView<T> extends Disposable {
767766
}
768767

769768
private getTooltip(tooltip?: string | vscode.MarkdownString): string | IMarkdownString | undefined {
770-
if (MarkdownStringType.isMarkdownString(tooltip)) {
769+
if (extHostTypes.MarkdownString.isMarkdownString(tooltip)) {
771770
return MarkdownString.from(tooltip);
772771
}
773772
return tooltip;
@@ -781,7 +780,7 @@ class ExtHostTreeView<T> extends Disposable {
781780
if (extensionTreeItem.checkboxState === undefined) {
782781
return undefined;
783782
}
784-
let checkboxState: TreeItemCheckboxState;
783+
let checkboxState: extHostTypes.TreeItemCheckboxState;
785784
let tooltip: string | undefined = undefined;
786785
let accessibilityInformation: IAccessibilityInformation | undefined = undefined;
787786
if (typeof extensionTreeItem.checkboxState === 'number') {
@@ -791,11 +790,11 @@ class ExtHostTreeView<T> extends Disposable {
791790
tooltip = extensionTreeItem.checkboxState.tooltip;
792791
accessibilityInformation = extensionTreeItem.checkboxState.accessibilityInformation;
793792
}
794-
return { isChecked: checkboxState === TreeItemCheckboxState.Checked, tooltip, accessibilityInformation };
793+
return { isChecked: checkboxState === extHostTypes.TreeItemCheckboxState.Checked, tooltip, accessibilityInformation };
795794
}
796795

797796
private validateTreeItem(extensionTreeItem: vscode.TreeItem) {
798-
if (!TreeItem.isTreeItem(extensionTreeItem, this.extension)) {
797+
if (!extHostTypes.TreeItem.isTreeItem(extensionTreeItem, this.extension)) {
799798
throw new Error(`Extension ${this.extension.identifier.value} has provided an invalid tree item.`);
800799
}
801800
}
@@ -817,7 +816,7 @@ class ExtHostTreeView<T> extends Disposable {
817816
icon,
818817
iconDark: this.getDarkIconPath(extensionTreeItem) || icon,
819818
themeIcon: this.getThemeIcon(extensionTreeItem),
820-
collapsibleState: isUndefinedOrNull(extensionTreeItem.collapsibleState) ? TreeItemCollapsibleState.None : extensionTreeItem.collapsibleState,
819+
collapsibleState: isUndefinedOrNull(extensionTreeItem.collapsibleState) ? extHostTypes.TreeItemCollapsibleState.None : extensionTreeItem.collapsibleState,
821820
accessibilityInformation: extensionTreeItem.accessibilityInformation,
822821
checkbox: this.getCheckbox(extensionTreeItem),
823822
};
@@ -832,8 +831,8 @@ class ExtHostTreeView<T> extends Disposable {
832831
};
833832
}
834833

835-
private getThemeIcon(extensionTreeItem: vscode.TreeItem): ThemeIcon | undefined {
836-
return extensionTreeItem.iconPath instanceof ThemeIcon ? extensionTreeItem.iconPath : undefined;
834+
private getThemeIcon(extensionTreeItem: vscode.TreeItem): extHostTypes.ThemeIcon | undefined {
835+
return extensionTreeItem.iconPath instanceof extHostTypes.ThemeIcon ? extensionTreeItem.iconPath : undefined;
837836
}
838837

839838
private createHandle(element: T, { id, label, resourceUri }: vscode.TreeItem, parent: TreeNode | Root, returnFirst?: boolean): TreeItemHandle {
@@ -865,7 +864,7 @@ class ExtHostTreeView<T> extends Disposable {
865864
}
866865

867866
private getLightIconPath(extensionTreeItem: vscode.TreeItem): URI | undefined {
868-
if (extensionTreeItem.iconPath && !(extensionTreeItem.iconPath instanceof ThemeIcon)) {
867+
if (extensionTreeItem.iconPath && !(extensionTreeItem.iconPath instanceof extHostTypes.ThemeIcon)) {
869868
if (typeof extensionTreeItem.iconPath === 'string'
870869
|| URI.isUri(extensionTreeItem.iconPath)) {
871870
return this.getIconPath(extensionTreeItem.iconPath);
@@ -876,7 +875,7 @@ class ExtHostTreeView<T> extends Disposable {
876875
}
877876

878877
private getDarkIconPath(extensionTreeItem: vscode.TreeItem): URI | undefined {
879-
if (extensionTreeItem.iconPath && !(extensionTreeItem.iconPath instanceof ThemeIcon) && (<{ light: string | URI; dark: string | URI }>extensionTreeItem.iconPath).dark) {
878+
if (extensionTreeItem.iconPath && !(extensionTreeItem.iconPath instanceof extHostTypes.ThemeIcon) && (<{ light: string | URI; dark: string | URI }>extensionTreeItem.iconPath).dark) {
880879
return this.getIconPath((<{ light: string | URI; dark: string | URI }>extensionTreeItem.iconPath).dark);
881880
}
882881
return undefined;

0 commit comments

Comments
 (0)