Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 10:38:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

enable duplicate imports tslint rule

Browse Source
This commit is contained in:
Joao Moreno
2016-11-11 17:01:55 +01:00
parent 6a07f2d94a
commit 2bb3dd5d95
46 changed files with 83 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/workbench/api/node/extHost.contribution.ts
View File

@@ -5,9 +5,8 @@
'use strict';
import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
import { Registry } from 'vs/platform/platform';
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
import { IInstantiationService, IConstructorSignature0 } from 'vs/platform/instantiation/common/instantiation';
import { IThreadService } from 'vs/workbench/services/thread/common/threadService';
import { MainContext, InstanceCollection } from './extHost.protocol';

3
src/vs/workbench/api/node/extHostExtensionService.ts
View File

@@ -4,8 +4,7 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import { dispose } from 'vs/base/common/lifecycle';
import { IDisposable } from 'vs/base/common/lifecycle';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import * as paths from 'vs/base/common/paths';
import Severity from 'vs/base/common/severity';
import { TPromise } from 'vs/base/common/winjs.base';

5
src/vs/workbench/api/node/extHostWorkspace.ts
View File

@@ -10,7 +10,6 @@ import { IThreadService } from 'vs/workbench/services/thread/common/threadServic
import { IResourceEdit } from 'vs/editor/common/services/bulkEdit';
import { TPromise } from 'vs/base/common/winjs.base';
import { fromRange } from 'vs/workbench/api/node/extHostTypeConverters';
import { Uri, CancellationToken } from 'vscode';
import { MainContext, MainThreadWorkspaceShape } from './extHost.protocol';
import * as vscode from 'vscode';
@@ -30,7 +29,7 @@ export class ExtHostWorkspace {
return this._workspacePath;
}
getRelativePath(pathOrUri: string | Uri): string {
getRelativePath(pathOrUri: string | vscode.Uri): string {
let path: string;
if (typeof pathOrUri === 'string') {
@@ -46,7 +45,7 @@ export class ExtHostWorkspace {
return path;
}
findFiles(include: string, exclude: string, maxResults?: number, token?: CancellationToken): Thenable<Uri[]> {
findFiles(include: string, exclude: string, maxResults?: number, token?: vscode.CancellationToken): Thenable<vscode.Uri[]> {
const requestId = ExtHostWorkspace._requestIdPool++;
const result = this._proxy.$startSearch(include, exclude, maxResults, requestId);
if (token) {