From 021995c10019ddfffa0ab358892d0ace61ebfeed Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Sat, 13 Feb 2016 00:10:03 +0100 Subject: [PATCH] tslint --- extensions/json/server/src/configuration.ts | 1 - extensions/json/server/src/jsonCompletion.ts | 3 +- .../json/server/src/jsonDocumentSymbols.ts | 1 - extensions/json/server/src/jsonHover.ts | 7 +-- extensions/json/server/src/jsonParser.ts | 1 - .../json/server/src/jsonSchemaService.ts | 2 - .../globPatternContribution.ts | 1 - .../packageJSONContribution.ts | 2 +- .../projectJSONContribution.ts | 2 +- extensions/json/server/src/server.ts | 6 +- .../json/server/src/test/textEditSupport.ts | 4 +- extensions/json/server/src/utils/uri.ts | 2 +- extensions/json/src/jsonMain.ts | 4 +- .../src/features/completionItemProvider.ts | 2 +- extensions/php/src/features/hoverProvider.ts | 2 +- .../php/src/features/signatureHelpProvider.ts | 2 +- .../php/src/features/validationProvider.ts | 4 -- extensions/php/src/phpMain.ts | 2 +- .../src/features/definitionProvider.ts | 2 +- .../src/features/documentHighlightProvider.ts | 2 +- .../src/features/documentSymbolProvider.ts | 2 +- .../src/features/formattingProvider.ts | 2 +- .../typescript/src/features/hoverProvider.ts | 2 +- .../src/features/referenceProvider.ts | 2 +- .../typescript/src/features/renameProvider.ts | 2 +- .../src/features/signatureHelpProvider.ts | 2 +- .../src/features/workspaceSymbolProvider.ts | 2 +- .../typescript/src/typescriptServiceClient.ts | 5 -- .../typescript/src/utils/electronForkStart.ts | 4 +- src/vs/base/browser/ui/list/listWidget.ts | 4 +- .../base/common/marked/simpleMarkedWorker.ts | 8 +-- src/vs/base/common/parsers.ts | 17 ++++-- .../editor/contrib/folding/browser/folding.ts | 8 +-- .../folding/common/indentFoldStrategy.ts | 1 - .../languages/css/common/parser/cssParser.ts | 3 +- .../languages/css/common/parser/cssScanner.ts | 6 +- .../css/common/services/cssLanguageService.ts | 2 +- .../css/common/services/intelliSense.ts | 21 +++---- src/vs/languages/css/common/services/lint.ts | 2 +- .../css/common/services/typeResolution.ts | 1 - src/vs/languages/html/common/html.ts | 2 +- .../common/javascript.contribution.ts | 2 +- .../javascript/common/javascriptWorker.ts | 1 - .../languages/json/common/jsonIntellisense.ts | 3 - .../less/common/parser/lessParser.ts | 2 +- .../less/common/parser/lessScanner.ts | 2 - .../sass/common/parser/sassParser.ts | 12 ++-- .../common/projectResolver.ts | 19 ------ .../typescript/common/features/diagnostics.ts | 2 - .../common/features/quickFixMainActions.ts | 7 --- .../common/js/es6PropertyDeclarator.ts | 3 +- .../common/js/importAndExportRewriter.ts | 6 +- .../common/typescript.contribution.ts | 2 +- .../parts/activitybar/activitybarPart.ts | 61 +++++++++---------- .../workbench/electron-main/sharedProcess.ts | 3 - src/vs/workbench/parts/tasks/common/tasks.ts | 46 ++++++-------- .../parts/tasks/node/processRunnerSystem.ts | 2 +- 57 files changed, 128 insertions(+), 195 deletions(-) diff --git a/extensions/json/server/src/configuration.ts b/extensions/json/server/src/configuration.ts index f3a64b84737..51832aa619d 100644 --- a/extensions/json/server/src/configuration.ts +++ b/extensions/json/server/src/configuration.ts @@ -5,7 +5,6 @@ 'use strict'; import nls = require('./utils/nls'); -import {IJSONSchema} from './json-toolbox/jsonSchema'; import {ISchemaContributions} from './jsonSchemaService'; diff --git a/extensions/json/server/src/jsonCompletion.ts b/extensions/json/server/src/jsonCompletion.ts index 70021077f44..9cfcc0d53b1 100644 --- a/extensions/json/server/src/jsonCompletion.ts +++ b/extensions/json/server/src/jsonCompletion.ts @@ -5,14 +5,13 @@ 'use strict'; -import URI from './utils/uri'; import Parser = require('./jsonParser'); import SchemaService = require('./jsonSchemaService'); import JsonSchema = require('./json-toolbox/jsonSchema'); import nls = require('./utils/nls'); import {IJSONWorkerContribution} from './jsonContributions'; -import {CompletionItem, CompletionItemKind, CompletionList, CompletionOptions, ITextDocument, TextDocumentIdentifier, TextDocumentPosition, Range, TextEdit} from 'vscode-languageserver'; +import {CompletionItem, CompletionItemKind, CompletionList, ITextDocument, TextDocumentPosition, Range, TextEdit} from 'vscode-languageserver'; export interface ISuggestionsCollector { add(suggestion: CompletionItem): void; diff --git a/extensions/json/server/src/jsonDocumentSymbols.ts b/extensions/json/server/src/jsonDocumentSymbols.ts index 1133ef6e1b5..54de7054eea 100644 --- a/extensions/json/server/src/jsonDocumentSymbols.ts +++ b/extensions/json/server/src/jsonDocumentSymbols.ts @@ -5,7 +5,6 @@ 'use strict'; import Parser = require('./jsonParser'); -import SchemaService = require('./jsonSchemaService'); import Strings = require('./utils/strings'); import {SymbolInformation, SymbolKind, ITextDocument, Range, Location} from 'vscode-languageserver'; diff --git a/extensions/json/server/src/jsonHover.ts b/extensions/json/server/src/jsonHover.ts index 4f2d17b37a4..135ef53e8b4 100644 --- a/extensions/json/server/src/jsonHover.ts +++ b/extensions/json/server/src/jsonHover.ts @@ -9,7 +9,7 @@ import Parser = require('./jsonParser'); import SchemaService = require('./jsonSchemaService'); import {IJSONWorkerContribution} from './jsonContributions'; -import {Hover, ITextDocument, TextDocumentPosition, Range, MarkedString, RemoteConsole} from 'vscode-languageserver'; +import {Hover, ITextDocument, TextDocumentPosition, Range, MarkedString} from 'vscode-languageserver'; export class JSONHover { @@ -25,7 +25,6 @@ export class JSONHover { let offset = document.offsetAt(textDocumentPosition.position); let node = doc.getNodeFromOffset(offset); - let originalNode = node; // use the property description when hovering over an object key if (node && node.type === 'string') { @@ -55,7 +54,7 @@ export class JSONHover { } return true; }); - + var createHover = (contents: MarkedString[]) => { let range = Range.create(document.positionAt(node.start), document.positionAt(node.end)); let result: Hover = { @@ -64,7 +63,7 @@ export class JSONHover { }; return result; }; - + let location = node.getNodeLocation(); for (let i = this.contributions.length - 1; i >= 0; i--) { let contribution = this.contributions[i]; diff --git a/extensions/json/server/src/jsonParser.ts b/extensions/json/server/src/jsonParser.ts index 5f81ee8a4a4..230f7d5b816 100644 --- a/extensions/json/server/src/jsonParser.ts +++ b/extensions/json/server/src/jsonParser.ts @@ -8,7 +8,6 @@ import nls = require('./utils/nls'); import Json = require('./json-toolbox/json'); import JsonSchema = require('./json-toolbox/jsonSchema'); import {JSONLocation} from './jsonLocation'; -import SchemaService = require('./jsonSchemaService'); export interface IRange { start: number; diff --git a/extensions/json/server/src/jsonSchemaService.ts b/extensions/json/server/src/jsonSchemaService.ts index cb5250e3b92..79b1199a2da 100644 --- a/extensions/json/server/src/jsonSchemaService.ts +++ b/extensions/json/server/src/jsonSchemaService.ts @@ -10,8 +10,6 @@ import {IJSONSchema} from './json-toolbox/jsonSchema'; import {IXHROptions, IXHRResponse, getErrorStatusDescription} from './utils/httpRequest'; import URI from './utils/uri'; import Strings = require('./utils/strings'); -import {parse as parseURL} from 'url'; -import path = require('path'); import Parser = require('./jsonParser'); export interface IJSONSchemaService { diff --git a/extensions/json/server/src/jsoncontributions/globPatternContribution.ts b/extensions/json/server/src/jsoncontributions/globPatternContribution.ts index 0cf01bc5a9a..e8c33ee5467 100644 --- a/extensions/json/server/src/jsoncontributions/globPatternContribution.ts +++ b/extensions/json/server/src/jsoncontributions/globPatternContribution.ts @@ -8,7 +8,6 @@ import {MarkedString, CompletionItemKind, CompletionItem} from 'vscode-languages import Strings = require('../utils/strings'); import nls = require('../utils/nls'); import {IJSONWorkerContribution, ISuggestionsCollector} from '../jsonContributions'; -import {IRequestService} from '../jsonSchemaService'; import {JSONLocation} from '../jsonLocation'; let globProperties:CompletionItem[] = [ diff --git a/extensions/json/server/src/jsoncontributions/packageJSONContribution.ts b/extensions/json/server/src/jsoncontributions/packageJSONContribution.ts index 21b411eff3a..06b82423f1b 100644 --- a/extensions/json/server/src/jsoncontributions/packageJSONContribution.ts +++ b/extensions/json/server/src/jsoncontributions/packageJSONContribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {MarkedString, CompletionItemKind, CompletionItem} from 'vscode-languageserver'; +import {MarkedString, CompletionItemKind} from 'vscode-languageserver'; import Strings = require('../utils/strings'); import nls = require('../utils/nls'); import {IJSONWorkerContribution, ISuggestionsCollector} from '../jsonContributions'; diff --git a/extensions/json/server/src/jsoncontributions/projectJSONContribution.ts b/extensions/json/server/src/jsoncontributions/projectJSONContribution.ts index 29633ff2f0d..ba33caa38a7 100644 --- a/extensions/json/server/src/jsoncontributions/projectJSONContribution.ts +++ b/extensions/json/server/src/jsoncontributions/projectJSONContribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {MarkedString, CompletionItemKind, CompletionItem} from 'vscode-languageserver'; +import {MarkedString, CompletionItemKind} from 'vscode-languageserver'; import Strings = require('../utils/strings'); import nls = require('../utils/nls'); import {IJSONWorkerContribution, ISuggestionsCollector} from '../jsonContributions'; diff --git a/extensions/json/server/src/server.ts b/extensions/json/server/src/server.ts index db697db3412..8e26304b2a2 100644 --- a/extensions/json/server/src/server.ts +++ b/extensions/json/server/src/server.ts @@ -6,10 +6,10 @@ import { IPCMessageReader, IPCMessageWriter, - createConnection, IConnection, TextDocumentSyncKind, + createConnection, IConnection, TextDocuments, ITextDocument, Diagnostic, DiagnosticSeverity, InitializeParams, InitializeResult, TextDocumentIdentifier, TextDocumentPosition, CompletionList, - CompletionItem, CompletionItemKind, Files, Hover, SymbolInformation, TextEdit, DocumentFormattingParams, + Hover, SymbolInformation, DocumentFormattingParams, DocumentRangeFormattingParams, NotificationType, RequestType } from 'vscode-languageserver'; @@ -18,7 +18,7 @@ import path = require('path'); import fs = require('fs'); import URI from './utils/uri'; import Strings = require('./utils/strings'); -import {IWorkspaceContextService, ITelemetryService, JSONSchemaService, ISchemaContributions, ISchemaAssociations} from './jsonSchemaService'; +import {JSONSchemaService, ISchemaAssociations} from './jsonSchemaService'; import {parse as parseJSON, ObjectASTNode, JSONDocument} from './jsonParser'; import {JSONCompletion} from './jsonCompletion'; import {JSONHover} from './jsonHover'; diff --git a/extensions/json/server/src/test/textEditSupport.ts b/extensions/json/server/src/test/textEditSupport.ts index b3b78552c5b..5f04be02f3c 100644 --- a/extensions/json/server/src/test/textEditSupport.ts +++ b/extensions/json/server/src/test/textEditSupport.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {ITextDocument, DocumentFormattingParams, Range, Position, FormattingOptions, TextEdit} from 'vscode-languageserver'; +import {ITextDocument, TextEdit} from 'vscode-languageserver'; import assert = require('assert'); export function applyEdits(document: ITextDocument, edits: TextEdit[]) : string { @@ -19,5 +19,5 @@ export function applyEdits(document: ITextDocument, edits: TextEdit[]) : string formatted = formatted.substring(0, startOffset) + e.newText + formatted.substring(endOffset, formatted.length); lastOffset = startOffset; }); - return formatted; + return formatted; } \ No newline at end of file diff --git a/extensions/json/server/src/utils/uri.ts b/extensions/json/server/src/utils/uri.ts index 921e11765f4..cd9c24e4e64 100644 --- a/extensions/json/server/src/utils/uri.ts +++ b/extensions/json/server/src/utils/uri.ts @@ -190,7 +190,7 @@ export default class URI { ret._path = match[5] || ret._path; ret._query = match[7] || ret._query; ret._fragment = match[9] || ret._fragment; - }; + } URI._validate(ret); return ret; } diff --git a/extensions/json/src/jsonMain.ts b/extensions/json/src/jsonMain.ts index a3436c4bef1..3e196cf8dae 100644 --- a/extensions/json/src/jsonMain.ts +++ b/extensions/json/src/jsonMain.ts @@ -6,8 +6,8 @@ import * as path from 'path'; -import {workspace, languages, Disposable, ExtensionContext, extensions, Uri} from 'vscode'; -import {LanguageClient, LanguageClientOptions, RequestType, SettingMonitor, ServerOptions, TransportKind, NotificationType} from 'vscode-languageclient'; +import {workspace, languages, ExtensionContext, extensions, Uri} from 'vscode'; +import {LanguageClient, LanguageClientOptions, RequestType, ServerOptions, TransportKind, NotificationType} from 'vscode-languageclient'; namespace TelemetryNotification { export const type: NotificationType<{ key: string, data: any }> = { get method() { return 'telemetry'; } }; diff --git a/extensions/php/src/features/completionItemProvider.ts b/extensions/php/src/features/completionItemProvider.ts index b9d2d093a2b..aafac986d7e 100644 --- a/extensions/php/src/features/completionItemProvider.ts +++ b/extensions/php/src/features/completionItemProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import {CompletionItemProvider, CompletionItem, CompletionItemKind, CancellationToken, TextDocument, Range, Position} from 'vscode'; +import {CompletionItemProvider, CompletionItem, CompletionItemKind, CancellationToken, TextDocument, Position} from 'vscode'; import phpGlobals = require('./phpGlobals'); export default class PHPCompletionItemProvider implements CompletionItemProvider { diff --git a/extensions/php/src/features/hoverProvider.ts b/extensions/php/src/features/hoverProvider.ts index 47666fcb5c3..9f19de9b7e1 100644 --- a/extensions/php/src/features/hoverProvider.ts +++ b/extensions/php/src/features/hoverProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import {HoverProvider, Hover, MarkedString, TextDocument, CancellationToken, Range, Position} from 'vscode'; +import {HoverProvider, Hover, MarkedString, TextDocument, CancellationToken, Position} from 'vscode'; import phpGlobals = require('./phpGlobals'); export default class PHPHoverProvider implements HoverProvider { diff --git a/extensions/php/src/features/signatureHelpProvider.ts b/extensions/php/src/features/signatureHelpProvider.ts index c41a7731cf3..a7e95f6104f 100644 --- a/extensions/php/src/features/signatureHelpProvider.ts +++ b/extensions/php/src/features/signatureHelpProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import {SignatureHelpProvider, SignatureHelp, SignatureInformation, ParameterInformation, Uri, CancellationToken, TextLine, TextDocument, Position} from 'vscode'; +import {SignatureHelpProvider, SignatureHelp, SignatureInformation, CancellationToken, TextDocument, Position} from 'vscode'; import phpGlobals = require('./phpGlobals'); var _NL = '\n'.charCodeAt(0); diff --git a/extensions/php/src/features/validationProvider.ts b/extensions/php/src/features/validationProvider.ts index 1024041f78a..da835f7ce3c 100644 --- a/extensions/php/src/features/validationProvider.ts +++ b/extensions/php/src/features/validationProvider.ts @@ -4,9 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as path from 'path'; import * as cp from 'child_process'; -import ChildProcess = cp.ChildProcess; import { NodeStringDecoder, StringDecoder } from 'string_decoder'; import * as vscode from 'vscode'; @@ -163,14 +161,12 @@ export default class PHPValidationProvider { private doValidate(textDocument: vscode.TextDocument): Promise { return new Promise((resolve, reject) => { let executable = this.executable || 'php'; - let filePath = textDocument.fileName; let decoder = new LineDecoder(); let diagnostics: vscode.Diagnostic[] = []; let processLine = (line: string) => { let matches = line.match(PHPValidationProvider.MatchExpression); if (matches) { let message = matches[1]; - let file = matches[2]; let line = parseInt(matches[3]) - 1; let diagnostic: vscode.Diagnostic = new vscode.Diagnostic( new vscode.Range(line, 0, line, Number.MAX_VALUE), diff --git a/extensions/php/src/phpMain.ts b/extensions/php/src/phpMain.ts index 4dad7999bad..e302d48f727 100644 --- a/extensions/php/src/phpMain.ts +++ b/extensions/php/src/phpMain.ts @@ -9,7 +9,7 @@ import PHPCompletionItemProvider from './features/completionItemProvider'; import PHPHoverProvider from './features/hoverProvider'; import PHPSignatureHelpProvider from './features/signatureHelpProvider'; import PHPValidationProvider from './features/validationProvider'; -import {ExtensionContext, languages, extensions} from 'vscode'; +import {ExtensionContext, languages} from 'vscode'; export function activate(context: ExtensionContext): any { diff --git a/extensions/typescript/src/features/definitionProvider.ts b/extensions/typescript/src/features/definitionProvider.ts index 1e8c8af2a28..7a868ef3705 100644 --- a/extensions/typescript/src/features/definitionProvider.ts +++ b/extensions/typescript/src/features/definitionProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import { workspace, DefinitionProvider, TextDocument, Position, Range, CancellationToken, Location } from 'vscode'; +import { DefinitionProvider, TextDocument, Position, Range, CancellationToken, Location } from 'vscode'; import * as Proto from '../protocol'; import { ITypescriptServiceClient } from '../typescriptService'; diff --git a/extensions/typescript/src/features/documentHighlightProvider.ts b/extensions/typescript/src/features/documentHighlightProvider.ts index 83468f7324c..67b52640fac 100644 --- a/extensions/typescript/src/features/documentHighlightProvider.ts +++ b/extensions/typescript/src/features/documentHighlightProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import { workspace, DocumentHighlightProvider, DocumentHighlight, DocumentHighlightKind, TextDocument, Position, Range, CancellationToken } from 'vscode'; +import { DocumentHighlightProvider, DocumentHighlight, DocumentHighlightKind, TextDocument, Position, Range, CancellationToken } from 'vscode'; import * as Proto from '../protocol'; import { ITypescriptServiceClient } from '../typescriptService'; diff --git a/extensions/typescript/src/features/documentSymbolProvider.ts b/extensions/typescript/src/features/documentSymbolProvider.ts index 1a9fa1fb857..6d1de81747c 100644 --- a/extensions/typescript/src/features/documentSymbolProvider.ts +++ b/extensions/typescript/src/features/documentSymbolProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import { workspace, DocumentSymbolProvider, SymbolInformation, SymbolKind, TextDocument, Position, Range, CancellationToken } from 'vscode'; +import { DocumentSymbolProvider, SymbolInformation, SymbolKind, TextDocument, Range, CancellationToken } from 'vscode'; import * as Proto from '../protocol'; import * as PConst from '../protocol.const'; diff --git a/extensions/typescript/src/features/formattingProvider.ts b/extensions/typescript/src/features/formattingProvider.ts index 3f3fe9a2322..47b16cd99e9 100644 --- a/extensions/typescript/src/features/formattingProvider.ts +++ b/extensions/typescript/src/features/formattingProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import { workspace, DocumentRangeFormattingEditProvider, OnTypeFormattingEditProvider, FormattingOptions, TextDocument, Position, Range, CancellationToken, TextEdit } from 'vscode'; +import { DocumentRangeFormattingEditProvider, OnTypeFormattingEditProvider, FormattingOptions, TextDocument, Position, Range, CancellationToken, TextEdit } from 'vscode'; import * as Proto from '../protocol'; import { ITypescriptServiceClient } from '../typescriptService'; diff --git a/extensions/typescript/src/features/hoverProvider.ts b/extensions/typescript/src/features/hoverProvider.ts index 432b4b98331..7bac2b7544e 100644 --- a/extensions/typescript/src/features/hoverProvider.ts +++ b/extensions/typescript/src/features/hoverProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import { workspace, HoverProvider, Hover, TextDocument, Position, Range, CancellationToken } from 'vscode'; +import { HoverProvider, Hover, TextDocument, Position, Range, CancellationToken } from 'vscode'; import * as Proto from '../protocol'; import { ITypescriptServiceClient } from '../typescriptService'; diff --git a/extensions/typescript/src/features/referenceProvider.ts b/extensions/typescript/src/features/referenceProvider.ts index fbf981709e8..2f331989416 100644 --- a/extensions/typescript/src/features/referenceProvider.ts +++ b/extensions/typescript/src/features/referenceProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import { workspace, ReferenceProvider, Location, TextDocument, Position, Range, CancellationToken } from 'vscode'; +import { ReferenceProvider, Location, TextDocument, Position, Range, CancellationToken } from 'vscode'; import * as Proto from '../protocol'; import { ITypescriptServiceClient } from '../typescriptService'; diff --git a/extensions/typescript/src/features/renameProvider.ts b/extensions/typescript/src/features/renameProvider.ts index c6c2bc40dae..e032a8d9a4a 100644 --- a/extensions/typescript/src/features/renameProvider.ts +++ b/extensions/typescript/src/features/renameProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import { workspace, RenameProvider, WorkspaceEdit, TextDocument, Position, Range, CancellationToken } from 'vscode'; +import { RenameProvider, WorkspaceEdit, TextDocument, Position, Range, CancellationToken } from 'vscode'; import * as Proto from '../protocol'; import { ITypescriptServiceClient } from '../typescriptService'; diff --git a/extensions/typescript/src/features/signatureHelpProvider.ts b/extensions/typescript/src/features/signatureHelpProvider.ts index c38c41e5123..bf3d9faa9a7 100644 --- a/extensions/typescript/src/features/signatureHelpProvider.ts +++ b/extensions/typescript/src/features/signatureHelpProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import { workspace, SignatureHelpProvider, SignatureHelp, SignatureInformation, ParameterInformation, TextDocument, Position, CancellationToken } from 'vscode'; +import { SignatureHelpProvider, SignatureHelp, SignatureInformation, ParameterInformation, TextDocument, Position, CancellationToken } from 'vscode'; import * as Previewer from './previewer'; import * as Proto from '../protocol'; diff --git a/extensions/typescript/src/features/workspaceSymbolProvider.ts b/extensions/typescript/src/features/workspaceSymbolProvider.ts index 2dd85c97d37..f712374e727 100644 --- a/extensions/typescript/src/features/workspaceSymbolProvider.ts +++ b/extensions/typescript/src/features/workspaceSymbolProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import { workspace, Uri, WorkspaceSymbolProvider, SymbolInformation, SymbolKind, TextDocument, Position, Range, CancellationToken } from 'vscode'; +import { workspace, Uri, WorkspaceSymbolProvider, SymbolInformation, SymbolKind, Range, CancellationToken } from 'vscode'; import * as Proto from '../protocol'; import { ITypescriptServiceClient } from '../typescriptService'; diff --git a/extensions/typescript/src/typescriptServiceClient.ts b/extensions/typescript/src/typescriptServiceClient.ts index f6ff99acea6..d5a96bf1e7b 100644 --- a/extensions/typescript/src/typescriptServiceClient.ts +++ b/extensions/typescript/src/typescriptServiceClient.ts @@ -18,11 +18,6 @@ import { ITypescriptServiceClient, ITypescriptServiceClientHost } from './types import * as SalsaStatus from './utils/salsaStatus'; -let isWin = /^win/.test(process.platform); -let isDarwin = /^darwin/.test(process.platform); -let isLinux = /^linux/.test(process.platform); -let arch = process.arch; - interface CallbackItem { c: (value: any) => void; e: (err: any) => void; diff --git a/extensions/typescript/src/utils/electronForkStart.ts b/extensions/typescript/src/utils/electronForkStart.ts index 9d8735d2dbc..2be54bfcce2 100644 --- a/extensions/typescript/src/utils/electronForkStart.ts +++ b/extensions/typescript/src/utils/electronForkStart.ts @@ -4,9 +4,7 @@ *--------------------------------------------------------------------------------------------*/ var net = require('net'), - fs = require('fs'), - stream = require('stream'), - util = require('util'); + fs = require('fs'); var ENABLE_LOGGING = false; diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts index 851dc414cdf..cce20517600 100644 --- a/src/vs/base/browser/ui/list/listWidget.ts +++ b/src/vs/base/browser/ui/list/listWidget.ts @@ -223,7 +223,9 @@ export class List implements IDisposable { if (this.length === 0) { return; } const selection = this.selection.get(); let index = selection.length > 0 ? selection[0] - n : 0; - if (loop && index < 0) index = this.length + (index % this.length); + if (loop && index < 0) { + index = this.length + (index % this.length); + } this.setSelection(Math.max(index, 0)); } diff --git a/src/vs/base/common/marked/simpleMarkedWorker.ts b/src/vs/base/common/marked/simpleMarkedWorker.ts index 7ff45ea3615..06a14908f8e 100644 --- a/src/vs/base/common/marked/simpleMarkedWorker.ts +++ b/src/vs/base/common/marked/simpleMarkedWorker.ts @@ -6,7 +6,7 @@ 'use strict'; import {WorkerServer} from 'vs/base/common/worker/workerServer'; -import {marked, MarkedOptions} from 'vs/base/common/marked/marked'; +import {marked} from 'vs/base/common/marked/marked'; function link(href, title, text): string { @@ -18,9 +18,9 @@ export const value = { markdownToHtml(main: WorkerServer, resolve: Function, reject: Function, progress: Function, data: { source: string; highlight: boolean; }): void { - function highlight(code: string, lang: string, callback?: (error: Error, result: string) => void) { - main.request('highlight', { code, lang }).then(value => callback(void 0, value), err => callback(err, void 0)); - }; + // function highlight(code: string, lang: string, callback?: (error: Error, result: string) => void) { + // main.request('highlight', { code, lang }).then(value => callback(void 0, value), err => callback(err, void 0)); + // } const renderer = new marked.Renderer(); renderer.link = link; diff --git a/src/vs/base/common/parsers.ts b/src/vs/base/common/parsers.ts index 6fd382a2eb6..0ce15b03d2f 100644 --- a/src/vs/base/common/parsers.ts +++ b/src/vs/base/common/parsers.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as Objects from 'vs/base/common/objects'; import * as Types from 'vs/base/common/types'; import { IStringDictionary } from 'vs/base/common/collections'; @@ -70,13 +69,21 @@ export abstract class Parser { protected is(value: any, func: (value:any) => boolean, wrongTypeState?: ValidationState, wrongTypeMessage?: string, undefinedState?: ValidationState, undefinedMessage?: string): boolean { if (Types.isUndefined(value)) { - if (undefinedState) this.validationStatus.state = undefinedState; - if (undefinedMessage) this.log(undefinedMessage); + if (undefinedState) { + this.validationStatus.state = undefinedState; + } + if (undefinedMessage) { + this.log(undefinedMessage); + } return false; } if (!func(value)) { - if (wrongTypeState) this.validationStatus.state = wrongTypeState; - if (wrongTypeMessage) this.log(wrongTypeMessage); + if (wrongTypeState) { + this.validationStatus.state = wrongTypeState; + } + if (wrongTypeMessage) { + this.log(wrongTypeMessage); + } return false; } return true; diff --git a/src/vs/editor/contrib/folding/browser/folding.ts b/src/vs/editor/contrib/folding/browser/folding.ts index b9e719c74d3..07898e79289 100644 --- a/src/vs/editor/contrib/folding/browser/folding.ts +++ b/src/vs/editor/contrib/folding/browser/folding.ts @@ -7,19 +7,17 @@ 'use strict'; import {RunOnceScheduler} from 'vs/base/common/async'; -import {Range} from 'vs/editor/common/core/range'; import EditorCommon = require('vs/editor/common/editorCommon'); import {IMouseEvent, ICodeEditor} from 'vs/editor/browser/editorBrowser'; import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {IDisposable, disposeAll} from 'vs/base/common/lifecycle'; -import Modes = require('vs/editor/common/modes'); import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; import {TPromise} from 'vs/base/common/winjs.base'; import foldStrategy = require('vs/editor/contrib/folding/common/indentFoldStrategy'); import {IFoldingRange, toString as rangeToString} from 'vs/editor/contrib/folding/common/foldingRange'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; -import {EditorAction, Behaviour} from 'vs/editor/common/editorAction'; +import {EditorAction} from 'vs/editor/common/editorAction'; import nls = require('vs/nls'); let log = function(msg: string) { @@ -74,7 +72,7 @@ class CollapsibleRegion { private getRangeDecorationOptions(): EditorCommon.IModelDecorationOptions { return { stickiness: EditorCommon.TrackedRangeStickiness.GrowsOnlyWhenTypingBefore - } + }; } public update(newRange:IFoldingRange, model:EditorCommon.IModel, changeAccessor:EditorCommon.IModelDecorationsChangeAccessor): void { @@ -181,7 +179,7 @@ export class FoldingController implements EditorCommon.IEditorContribution { if (range) { collapsedRegions.push({ startLineNumber: range.startLineNumber, endLineNumber: range.endLineNumber, isCollapsed: true}); } - }; + } }); return collapsedRegions; } diff --git a/src/vs/editor/contrib/folding/common/indentFoldStrategy.ts b/src/vs/editor/contrib/folding/common/indentFoldStrategy.ts index 18c6dcf9bce..6560c32d0a7 100644 --- a/src/vs/editor/contrib/folding/common/indentFoldStrategy.ts +++ b/src/vs/editor/contrib/folding/common/indentFoldStrategy.ts @@ -5,7 +5,6 @@ 'use strict'; -import {TPromise} from 'vs/base/common/winjs.base'; import EditorCommon = require('vs/editor/common/editorCommon'); import {IFoldingRange} from 'vs/editor/contrib/folding/common/foldingRange'; diff --git a/src/vs/languages/css/common/parser/cssParser.ts b/src/vs/languages/css/common/parser/cssParser.ts index b7be152acee..cd8224147a1 100644 --- a/src/vs/languages/css/common/parser/cssParser.ts +++ b/src/vs/languages/css/common/parser/cssParser.ts @@ -272,7 +272,6 @@ export class Parser { case nodes.NodeType.MSViewPort: case nodes.NodeType.Media: case nodes.NodeType.Ruleset: - case nodes.NodeType.Media: case nodes.NodeType.Namespace: case nodes.NodeType.If: case nodes.NodeType.For: @@ -326,7 +325,7 @@ export class Parser { public _parseBody(node: T, parseDeclaration: () => nodes.Node): T { if (!node.setDeclarations(this._parseDeclarations(parseDeclaration))) { return this.finish(node, errors.ParseError.LeftCurlyExpected, [scanner.TokenType.CurlyR, scanner.TokenType.SemiColon ]); - }; + } return this.finish(node); } diff --git a/src/vs/languages/css/common/parser/cssScanner.ts b/src/vs/languages/css/common/parser/cssScanner.ts index 104a1b31073..7af38068e7d 100644 --- a/src/vs/languages/css/common/parser/cssScanner.ts +++ b/src/vs/languages/css/common/parser/cssScanner.ts @@ -138,16 +138,12 @@ export class MultiLineStream { } var _a = 'a'.charCodeAt(0); -var _c = 'c'.charCodeAt(0); var _e = 'e'.charCodeAt(0); var _f = 'f'.charCodeAt(0); -var _h = 'h'.charCodeAt(0); var _i = 'i'.charCodeAt(0); var _l = 'l'.charCodeAt(0); var _p = 'p'.charCodeAt(0); var _r = 'r'.charCodeAt(0); -var _s = 's'.charCodeAt(0); -var _t = 't'.charCodeAt(0); var _u = 'u'.charCodeAt(0); var _x = 'x'.charCodeAt(0); var _z = 'z'.charCodeAt(0); @@ -514,7 +510,7 @@ export class Scanner { } return true; } - if (ch !== _CAR && ch !== _LFD && ch != _NWL) { + if (ch !== _CAR && ch !== _LFD && ch !== _NWL) { this.stream.advance(1); result.push(String.fromCharCode(ch)); return true; diff --git a/src/vs/languages/css/common/services/cssLanguageService.ts b/src/vs/languages/css/common/services/cssLanguageService.ts index 160e2126747..fec9131b99e 100644 --- a/src/vs/languages/css/common/services/cssLanguageService.ts +++ b/src/vs/languages/css/common/services/cssLanguageService.ts @@ -122,7 +122,7 @@ export class CSSLanguageService implements ILanguageService { private updateResources():void { - var t1 = new Date().getTime(), n = 0; + var n = 0; this.resourceService.all().filter((element) => this._isMyMirrorModel(element)).forEach((model:EditorCommon.IMirrorModel) => { // Reparse changes or new models diff --git a/src/vs/languages/css/common/services/intelliSense.ts b/src/vs/languages/css/common/services/intelliSense.ts index 3bebbf47b27..7548e910f2c 100644 --- a/src/vs/languages/css/common/services/intelliSense.ts +++ b/src/vs/languages/css/common/services/intelliSense.ts @@ -12,7 +12,6 @@ import URI from 'vs/base/common/uri'; import EditorCommon = require('vs/editor/common/editorCommon'); import Modes = require('vs/editor/common/modes'); import nls = require('vs/nls'); -import scanner = require('vs/languages/css/common/parser/cssScanner'); export class CSSIntellisense { @@ -267,7 +266,7 @@ export class CSSIntellisense { type: 'function' }); }); - }; + } return result; } @@ -281,7 +280,7 @@ export class CSSIntellisense { type: 'value' }); } - }; + } return result; } @@ -295,7 +294,7 @@ export class CSSIntellisense { type: 'value' }); } - }; + } return result; } @@ -309,7 +308,7 @@ export class CSSIntellisense { type: 'value' }); } - }; + } if (entry.restrictions.indexOf('line-width') !== -1) { languageFacts.lineWidthKeywords.forEach((lineWidth) => { result.push({ @@ -318,7 +317,7 @@ export class CSSIntellisense { type: 'value' }); }); - }; + } return result; } @@ -333,7 +332,7 @@ export class CSSIntellisense { type: 'value' }); } - }; + } if (entry.restrictions.indexOf('box') !== -1 || geometryBox !== -1) { for (var box in languageFacts.boxKeywords) { result.push({ @@ -343,7 +342,7 @@ export class CSSIntellisense { type: 'value' }); } - }; + } return result; } @@ -357,7 +356,7 @@ export class CSSIntellisense { type: 'function' }); } - }; + } return result; } @@ -371,7 +370,7 @@ export class CSSIntellisense { type: 'function' }); } - }; + } return result; } @@ -385,7 +384,7 @@ export class CSSIntellisense { type: 'function' }); } - }; + } return result; } diff --git a/src/vs/languages/css/common/services/lint.ts b/src/vs/languages/css/common/services/lint.ts index fc585988fc8..afd81325141 100644 --- a/src/vs/languages/css/common/services/lint.ts +++ b/src/vs/languages/css/common/services/lint.ts @@ -203,7 +203,7 @@ export class LintVisitor implements nodes.IVisitor { if (missingVendorSpecific || needsStandard) { keyframes.data[name].nodes.forEach(addVendorSpecificWarnings); } - }; + } return true; } diff --git a/src/vs/languages/css/common/services/typeResolution.ts b/src/vs/languages/css/common/services/typeResolution.ts index b1f7967c6a8..fcd6b172e4f 100644 --- a/src/vs/languages/css/common/services/typeResolution.ts +++ b/src/vs/languages/css/common/services/typeResolution.ts @@ -73,7 +73,6 @@ export function typeFromNode(node:nodes.Node):IType { case nodes.NodeType.NumericValue: return typeFromNumeric( node); case nodes.NodeType.HexColorValue: return SimpleType.Color; case nodes.NodeType.Identifier: return typeFromLiteral(node); - case nodes.NodeType.Function: return typeFromFunction( node); case nodes.NodeType.FunctionArgument: return typeFromFunctionArgument( node); } diff --git a/src/vs/languages/html/common/html.ts b/src/vs/languages/html/common/html.ts index 71acc1afb88..970de3de22f 100644 --- a/src/vs/languages/html/common/html.ts +++ b/src/vs/languages/html/common/html.ts @@ -368,7 +368,7 @@ export class HTMLMode extends AbstractMode i open: key, close: map[key] }); - }; + } return result; } diff --git a/src/vs/languages/javascript/common/javascript.contribution.ts b/src/vs/languages/javascript/common/javascript.contribution.ts index 3699d8d2e41..3dd9246e273 100644 --- a/src/vs/languages/javascript/common/javascript.contribution.ts +++ b/src/vs/languages/javascript/common/javascript.contribution.ts @@ -10,7 +10,7 @@ import platform = require('vs/platform/platform'); import ConfigurationRegistry = require('vs/platform/configuration/common/configurationRegistry'); import {LanguageExtensions} from 'vs/editor/common/modes/languageExtensionPoint'; import Options = require('vs/languages/typescript/common/options'); -import defaults = Options.javaScriptOptions; +let defaults = Options.javaScriptOptions; if (!env.enableTypeScriptServiceModeForJS) { diff --git a/src/vs/languages/javascript/common/javascriptWorker.ts b/src/vs/languages/javascript/common/javascriptWorker.ts index 8fd49fb532d..86287422aac 100644 --- a/src/vs/languages/javascript/common/javascriptWorker.ts +++ b/src/vs/languages/javascript/common/javascriptWorker.ts @@ -56,7 +56,6 @@ export class JavaScriptWorker extends typeScriptWorker.TypeScriptWorker2 { // perform the semantic checks on the rewritten project and // filter/translate the error markers - var missing: URI[] = []; var project = this._projectService.getProject(resource, this._fancyRewriters); var result = diagnostics.getSemanticDiagnostics(project.languageService, resource, this._options); if (result) { diff --git a/src/vs/languages/json/common/jsonIntellisense.ts b/src/vs/languages/json/common/jsonIntellisense.ts index 31591666c98..4fbea339f44 100644 --- a/src/vs/languages/json/common/jsonIntellisense.ts +++ b/src/vs/languages/json/common/jsonIntellisense.ts @@ -173,8 +173,6 @@ export class JSONIntellisense { var matchingSchemas: Parser.IApplicableSchema[] = []; doc.validate(schema.schema, matchingSchemas, node.start); - var collectPromises: WinJS.TPromise[] = []; - matchingSchemas.forEach((s) => { if (s.node === node && !s.inverted) { var schemaProperties = s.schema.properties; @@ -266,7 +264,6 @@ export class JSONIntellisense { public getValueSuggestions(resource: URI, schema: SchemaService.ResolvedSchema, doc: Parser.JSONDocument, node: Parser.ASTNode, offset: number, collector: JsonWorker.ISuggestionsCollector) : void { - var collectPromises: WinJS.TPromise[] = []; if (!node) { this.addDefaultSuggestion(schema.schema, collector); } else { diff --git a/src/vs/languages/less/common/parser/lessParser.ts b/src/vs/languages/less/common/parser/lessParser.ts index 63c0b4d27de..457d23aeb9d 100644 --- a/src/vs/languages/less/common/parser/lessParser.ts +++ b/src/vs/languages/less/common/parser/lessParser.ts @@ -264,7 +264,7 @@ export class LessParser extends cssParser.Parser { } if (!node.setSelector(this._parseSimpleSelector())) { return this.finish(node, errors.ParseError.SelectorExpected); - }; + } if (!this.accept(scanner.TokenType.ParenthesisR)) { return this.finish(node, errors.ParseError.RightParenthesisExpected); } diff --git a/src/vs/languages/less/common/parser/lessScanner.ts b/src/vs/languages/less/common/parser/lessScanner.ts index ba64c5af013..196ca531daa 100644 --- a/src/vs/languages/less/common/parser/lessScanner.ts +++ b/src/vs/languages/less/common/parser/lessScanner.ts @@ -6,8 +6,6 @@ import scanner = require('vs/languages/css/common/parser/cssScanner'); -var _PRC = '%'.charCodeAt(0); -var _LPA = '('.charCodeAt(0); var _FSL = '/'.charCodeAt(0); var _NWL = '\n'.charCodeAt(0); var _CAR = '\r'.charCodeAt(0); diff --git a/src/vs/languages/sass/common/parser/sassParser.ts b/src/vs/languages/sass/common/parser/sassParser.ts index d10c8696741..399f6efccd0 100644 --- a/src/vs/languages/sass/common/parser/sassParser.ts +++ b/src/vs/languages/sass/common/parser/sassParser.ts @@ -217,7 +217,7 @@ export class SassParser extends cssParser.Parser { if (this.accept(scanner.TokenType.AtKeyword, '@extend')) { if (!node.setSelector(this._parseSimpleSelector())) { return this.finish(node, errors.ParseError.SelectorExpected); - }; + } if (this.accept(scanner.TokenType.Exclamation)) { if (!this.accept(scanner.TokenType.Ident, 'optional', true)) { return this.finish(node, errors.ParseError.UnknownKeyword); @@ -282,7 +282,7 @@ export class SassParser extends cssParser.Parser { this.consumeToken(); // @if or if if (!node.setExpression(this._parseBinaryExpr())) { return this.finish(node, errors.ParseError.ExpressionExpected); - }; + } this._parseBody(node, parseStatement); if (this.accept(scanner.TokenType.AtKeyword, '@else')) { if (this.peek(scanner.TokenType.Ident, 'if')) { @@ -311,13 +311,13 @@ export class SassParser extends cssParser.Parser { } if (!node.addChild(this._parseBinaryExpr())) { return this.finish(node, errors.ParseError.ExpressionExpected, [ scanner.TokenType.CurlyR ]); - }; + } if (!this.accept(scanner.TokenType.Ident, 'to') && !this.accept(scanner.TokenType.Ident, 'through')) { return this.finish(node, sassErrors.ParseError.ThroughOrToExpected, [ scanner.TokenType.CurlyR ]); } if (!node.addChild(this._parseBinaryExpr())) { return this.finish(node, errors.ParseError.ExpressionExpected, [ scanner.TokenType.CurlyR ]); - }; + } return this._parseBody(node, parseStatement); } @@ -337,7 +337,7 @@ export class SassParser extends cssParser.Parser { } if (!node.addChild(this._parseExpr())) { return this.finish(node, errors.ParseError.ExpressionExpected, [ scanner.TokenType.CurlyR ]); - }; + } return this._parseBody(node, parseStatement); } @@ -351,7 +351,7 @@ export class SassParser extends cssParser.Parser { this.consumeToken(); // @while if (!node.addChild(this._parseBinaryExpr())) { return this.finish(node, errors.ParseError.ExpressionExpected, [ scanner.TokenType.CurlyR ]); - }; + } return this._parseBody(node, parseStatement); } diff --git a/src/vs/languages/typescript.workbench/common/projectResolver.ts b/src/vs/languages/typescript.workbench/common/projectResolver.ts index 199fb500d6e..00cb49fa948 100644 --- a/src/vs/languages/typescript.workbench/common/projectResolver.ts +++ b/src/vs/languages/typescript.workbench/common/projectResolver.ts @@ -540,25 +540,6 @@ class ProjectResolver implements typescript.IProjectResolver2 { } } - private static _lookUpProjects(resource: URI, index: { [dirname: string]: URI }): URI[] { - - var dirnames = paths.dirnames(resource.fsPath), - element = dirnames.next(), - result: URI[]; - - while (!element.done) { - var project = index[element.value]; - if (project) { - if (!result) { - result = []; - } - result.push(project); - } - element = dirnames.next(); - } - return result; - } - private static _asChangeKind(fileChangeType: Files.FileChangeType): typescript.ChangeKind { switch (fileChangeType) { case Files.FileChangeType.UPDATED: return typescript.ChangeKind.Changed; diff --git a/src/vs/languages/typescript/common/features/diagnostics.ts b/src/vs/languages/typescript/common/features/diagnostics.ts index b87b8e722f1..7ef1fc58883 100644 --- a/src/vs/languages/typescript/common/features/diagnostics.ts +++ b/src/vs/languages/typescript/common/features/diagnostics.ts @@ -44,7 +44,6 @@ export function getSemanticDiagnostics(languageService: ts.LanguageService, reso if (options.validate.enable && options.validate.semanticValidation) { var diagnostics = languageService.getSemanticDiagnostics(resource.toString()), - unresolved: string[] = [], classifier = createDiagnosticClassifier(options); for (var i = 0; i < diagnostics.length; i++) { @@ -205,7 +204,6 @@ function _getJavaScriptSemanticDiagnostics(sourceFile: ts.SourceFile, options: t case ts.SyntaxKind.GetAccessor: case ts.SyntaxKind.SetAccessor: case ts.SyntaxKind.FunctionExpression: - case ts.SyntaxKind.FunctionDeclaration: case ts.SyntaxKind.FunctionDeclaration: var functionDeclaration = node; if (checkModifiers(functionDeclaration.modifiers) || diff --git a/src/vs/languages/typescript/common/features/quickFixMainActions.ts b/src/vs/languages/typescript/common/features/quickFixMainActions.ts index 65542bf3a97..5cff88f0dfb 100644 --- a/src/vs/languages/typescript/common/features/quickFixMainActions.ts +++ b/src/vs/languages/typescript/common/features/quickFixMainActions.ts @@ -55,13 +55,6 @@ export class QuickFixMainActions { resourcePath = resource.fsPath; } - var currentFolderPath = strings.rtrim(paths.dirname(resourcePath), '/'); - var relativeDtsPath = paths.relative(currentFolderPath, dtsFile); - - var action = { - edits: [] - }; - return this._fileService.resolveFile(dtsFileResource).then(file => { // file exists already return { diff --git a/src/vs/languages/typescript/common/js/es6PropertyDeclarator.ts b/src/vs/languages/typescript/common/js/es6PropertyDeclarator.ts index 947b3b36fd4..e593c33b4e7 100644 --- a/src/vs/languages/typescript/common/js/es6PropertyDeclarator.ts +++ b/src/vs/languages/typescript/common/js/es6PropertyDeclarator.ts @@ -15,8 +15,7 @@ class ES6PropertyDeclarator implements rewriter.ISyntaxRewriter { public computeEdits(context: rewriter.AnalyzerContext): void { - var offset = 0, - sourceText = context.sourceFile.getFullText(), + var sourceText = context.sourceFile.getFullText(), pattern = /\bclass\b/g; while (pattern.test(sourceText)) { diff --git a/src/vs/languages/typescript/common/js/importAndExportRewriter.ts b/src/vs/languages/typescript/common/js/importAndExportRewriter.ts index 696123a00da..cd9f571602a 100644 --- a/src/vs/languages/typescript/common/js/importAndExportRewriter.ts +++ b/src/vs/languages/typescript/common/js/importAndExportRewriter.ts @@ -373,9 +373,9 @@ export class ImportsAndExportsCollector implements rewriter.ISyntaxRewriter { // // this._context.newReplace(node.offset, node.length - node.name.length, 'export var '); // } - private _translateNamedExportExpresson(node:NamedExportExpresson):void { - this._context.newAppend(`export var ${node.name}:any;\n`); - } + // private _translateNamedExportExpresson(node:NamedExportExpresson):void { + // this._context.newAppend(`export var ${node.name}:any;\n`); + // } private _translateDefineNode(node:DefineNode):void { diff --git a/src/vs/languages/typescript/common/typescript.contribution.ts b/src/vs/languages/typescript/common/typescript.contribution.ts index 888eeff4d92..e330f36772e 100644 --- a/src/vs/languages/typescript/common/typescript.contribution.ts +++ b/src/vs/languages/typescript/common/typescript.contribution.ts @@ -11,7 +11,7 @@ import platform = require('vs/platform/platform'); import modesExtensions = require('vs/editor/common/modes/modesRegistry'); import ConfigurationRegistry = require('vs/platform/configuration/common/configurationRegistry'); import options = require('vs/languages/typescript/common/options'); -import defaults = options.typeScriptOptions; +let defaults = options.typeScriptOptions; // ----- Registration and Configuration -------------------------------------------------------- diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts index b6bb20a52d4..cd5f4a3c516 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts @@ -9,11 +9,10 @@ import 'vs/css!./media/activityBarPart'; import nls = require('vs/nls'); import {TPromise} from 'vs/base/common/winjs.base'; import {Builder, $} from 'vs/base/browser/builder'; -import {Action, IAction} from 'vs/base/common/actions'; +import {Action} from 'vs/base/common/actions'; import errors = require('vs/base/common/errors'); import {ActionsOrientation, ActionBar, IActionItem} from 'vs/base/browser/ui/actionbar/actionbar'; -import {Scope, IActionBarRegistry, Extensions as ActionBarExtensions} from 'vs/workbench/browser/actionBarRegistry'; -import {CONTEXT, ToolBar} from 'vs/base/browser/ui/toolbar/toolbar'; +import {ToolBar} from 'vs/base/browser/ui/toolbar/toolbar'; import {Registry} from 'vs/platform/platform'; import {CompositeEvent, EventType} from 'vs/workbench/common/events'; import {ViewletDescriptor, ViewletRegistry, Extensions as ViewletExtensions} from 'vs/workbench/browser/viewlet'; @@ -187,41 +186,41 @@ export class ActivitybarPart extends Part implements IActivityService { // this.globalToolBar.setActions(prepareActions(primaryActions), prepareActions(secondaryActions))(); // } - private getGlobalActions(primary: boolean): IAction[] { - let actionBarRegistry = Registry.as(ActionBarExtensions.Actionbar); + // private getGlobalActions(primary: boolean): IAction[] { + // let actionBarRegistry = Registry.as(ActionBarExtensions.Actionbar); - // Collect actions from actionbar contributor - let actions: IAction[]; - if (primary) { - actions = actionBarRegistry.getActionBarActionsForContext(Scope.GLOBAL, CONTEXT); - } else { - actions = actionBarRegistry.getSecondaryActionBarActionsForContext(Scope.GLOBAL, CONTEXT); - } + // // Collect actions from actionbar contributor + // let actions: IAction[]; + // if (primary) { + // actions = actionBarRegistry.getActionBarActionsForContext(Scope.GLOBAL, CONTEXT); + // } else { + // actions = actionBarRegistry.getSecondaryActionBarActionsForContext(Scope.GLOBAL, CONTEXT); + // } - return actions.map((action: Action) => { - if (primary) { - let keybinding: string = null; - let keys = this.keybindingService.lookupKeybindings(action.id).map(k => this.keybindingService.getLabelFor(k)); - if (keys && keys.length) { - keybinding = keys[0]; - } + // return actions.map((action: Action) => { + // if (primary) { + // let keybinding: string = null; + // let keys = this.keybindingService.lookupKeybindings(action.id).map(k => this.keybindingService.getLabelFor(k)); + // if (keys && keys.length) { + // keybinding = keys[0]; + // } - let actionItem = actionBarRegistry.getActionItemForContext(Scope.GLOBAL, CONTEXT, action); + // let actionItem = actionBarRegistry.getActionItemForContext(Scope.GLOBAL, CONTEXT, action); - if (!actionItem) { - actionItem = new ActivityActionItem(action, action.label, keybinding); - } + // if (!actionItem) { + // actionItem = new ActivityActionItem(action, action.label, keybinding); + // } - if (actionItem instanceof ActivityActionItem) { - ( actionItem).keybinding = keybinding; - } + // if (actionItem instanceof ActivityActionItem) { + // ( actionItem).keybinding = keybinding; + // } - this.activityActionItems[action.id] = actionItem; - } + // this.activityActionItems[action.id] = actionItem; + // } - return action; - }); - } + // return action; + // }); + // } public dispose(): void { if (this.viewletSwitcherBar) { diff --git a/src/vs/workbench/electron-main/sharedProcess.ts b/src/vs/workbench/electron-main/sharedProcess.ts index d1563ec3dd7..e5cddc2ba13 100644 --- a/src/vs/workbench/electron-main/sharedProcess.ts +++ b/src/vs/workbench/electron-main/sharedProcess.ts @@ -33,9 +33,6 @@ function getEnvironment(): IEnvironment { return configuration; } -// The amd loader has the global scope assigned to this. -const globalRequire = this.require; - function _spawnSharedProcess(): cp.ChildProcess { // Make sure the nls configuration travels to the plugin host. const opts = { diff --git a/src/vs/workbench/parts/tasks/common/tasks.ts b/src/vs/workbench/parts/tasks/common/tasks.ts index 351428d01fd..59bf0f9fabb 100644 --- a/src/vs/workbench/parts/tasks/common/tasks.ts +++ b/src/vs/workbench/parts/tasks/common/tasks.ts @@ -15,16 +15,8 @@ import { Executable, ExecutableParser, Config as ProcessConfig} from 'vs/base/c import { ProblemMatcher, Config as ProblemMatcherConfig, ProblemMatcherParser, registry as ProblemMatcherRegistry } from 'vs/platform/markers/common/problemMatcher'; -import { IPluginDescription } from 'vs/platform/plugins/common/plugins'; - export namespace Config { - export namespace ShowOutput { - let always: string = 'always'; - let silent: string = 'silent'; - let never: string = 'never'; - } - /** * The description of a task. */ @@ -256,7 +248,7 @@ export class TaskParser extends Parser { // TODO@Dirk: provide JSON schema here // }); -const extensionPoint: string = 'tasks'; +// const extensionPoint: string = 'tasks'; export class TaskRegistry { private tasks: IStringDictionary; @@ -278,25 +270,25 @@ export class TaskRegistry { */ } - private onDescriptions(descriptions: IPluginDescription[]) { - descriptions.forEach(description => { - let extensions = description.contributes[extensionPoint]; - if (Types.isArray(extensions)) { - (extensions).forEach(this.onTask, this); - } else { - this.onTask(extensions); - } - }); - } + // private onDescriptions(descriptions: IPluginDescription[]) { + // descriptions.forEach(description => { + // let extensions = description.contributes[extensionPoint]; + // if (Types.isArray(extensions)) { + // (extensions).forEach(this.onTask, this); + // } else { + // this.onTask(extensions); + // } + // }); + // } - private onTask(json: Config.Task): void { - let logger: ILogger = { - log: (message) => { console.warn(message); } - }; - let parser = new TaskParser(ProblemMatcherRegistry, logger); - let result = parser.parse(json, { emptyExecutable: true, emptyCommand: true }); - this.add(result); - } + // private onTask(json: Config.Task): void { + // let logger: ILogger = { + // log: (message) => { console.warn(message); } + // }; + // let parser = new TaskParser(ProblemMatcherRegistry, logger); + // let result = parser.parse(json, { emptyExecutable: true, emptyCommand: true }); + // this.add(result); + // } public add(task: Task): void { this.tasks[task.id] = task; diff --git a/src/vs/workbench/parts/tasks/node/processRunnerSystem.ts b/src/vs/workbench/parts/tasks/node/processRunnerSystem.ts index 1a5f767391c..f598b0d7935 100644 --- a/src/vs/workbench/parts/tasks/node/processRunnerSystem.ts +++ b/src/vs/workbench/parts/tasks/node/processRunnerSystem.ts @@ -70,7 +70,7 @@ export class ProcessRunnerSystem extends EventEmitter implements ITaskSystem { } this.errorsShown = false; let parseResult = FileConfig.parse(fileConfig, this); - this.validationStatus = parseResult.validationStatus;; + this.validationStatus = parseResult.validationStatus; this.configuration = parseResult.configuration; this.defaultBuildTaskIdentifier = parseResult.defaultBuildTaskIdentifier; this.defaultTestTaskIdentifier = parseResult.defaultTestTaskIdentifier;