diff --git a/extensions/json/server/src/configuration.ts b/extensions/json/server/src/configuration.ts index 4d191e4461a..f3a64b84737 100644 --- a/extensions/json/server/src/configuration.ts +++ b/extensions/json/server/src/configuration.ts @@ -254,4 +254,4 @@ export var schemaContributions: ISchemaContributions = { 'default': {} } } -} \ No newline at end of file +}; \ No newline at end of file diff --git a/extensions/json/server/src/jsonCompletion.ts b/extensions/json/server/src/jsonCompletion.ts index 779b66055a7..70021077f44 100644 --- a/extensions/json/server/src/jsonCompletion.ts +++ b/extensions/json/server/src/jsonCompletion.ts @@ -40,7 +40,7 @@ export class JSONCompletion { let result: CompletionList = { items: [], isIncomplete: false - } + }; if (node && (node.type === 'string' || node.type === 'number' || node.type === 'boolean' || node.type === 'null')) { overwriteRange = Range.create(document.positionAt(node.start), document.positionAt(node.end)); @@ -401,7 +401,7 @@ export class JSONCompletion { case 'string': return CompletionItemKind.Text; case 'object': return CompletionItemKind.Module; case 'property': return CompletionItemKind.Property; - default: return CompletionItemKind.Value + default: return CompletionItemKind.Value; } } diff --git a/extensions/json/server/src/jsonDocumentSymbols.ts b/extensions/json/server/src/jsonDocumentSymbols.ts index 2e148fb6ffd..1133ef6e1b5 100644 --- a/extensions/json/server/src/jsonDocumentSymbols.ts +++ b/extensions/json/server/src/jsonDocumentSymbols.ts @@ -59,7 +59,7 @@ export class JSONDocumentSymbols { }); } return result; - } + }; let result = collectOutlineEntries([], root, void 0); return Promise.resolve(result); } diff --git a/extensions/json/server/src/jsonSchemaService.ts b/extensions/json/server/src/jsonSchemaService.ts index 09c16651d17..cb5250e3b92 100644 --- a/extensions/json/server/src/jsonSchemaService.ts +++ b/extensions/json/server/src/jsonSchemaService.ts @@ -208,7 +208,7 @@ export interface IWorkspaceContextService { } export interface IRequestService { - (options: IXHROptions): Thenable + (options: IXHROptions): Thenable; } export class JSONSchemaService implements IJSONSchemaService { @@ -277,7 +277,7 @@ export class JSONSchemaService implements IJSONSchemaService { var fpa = this.getOrAddFilePatternAssociation(pattern); associations.forEach(schemaId => { let id = this.normalizeId(schemaId); - fpa.addSchema(id) + fpa.addSchema(id); }); } } @@ -398,7 +398,7 @@ export class JSONSchemaService implements IJSONSchemaService { resolveErrors.push(nls.localize('json.schema.invalidref', '$ref \'{0}\' in {1} can not be resolved.', linkPath, linkedSchema.id)); } delete node.$ref; - } + }; let resolveExternalLink = (node: any, uri: string, linkPath: string): Thenable => { return this.getOrAddSchemaHandle(uri).getUnresolvedSchema().then(unresolvedSchema => { @@ -409,7 +409,7 @@ export class JSONSchemaService implements IJSONSchemaService { resolveLink(node, unresolvedSchema.schema, linkPath); return resolveRefs(node, unresolvedSchema.schema); }); - } + }; let resolveRefs = (node: any, parentSchema: any): Thenable => { let toWalk = [node]; @@ -443,7 +443,7 @@ export class JSONSchemaService implements IJSONSchemaService { } } return Promise.all(openPromises); - } + }; return resolveRefs(schema, schema).then(_ => new ResolvedSchema(schema, resolveErrors)); } @@ -486,7 +486,7 @@ export class JSONSchemaService implements IJSONSchemaService { } else { let combinedSchema: IJSONSchema = { allOf: schemaIds.map(schemaId => ({ $ref: schemaId })) - } + }; return this.addSchemaHandle(combinedSchemaId, combinedSchema); } } diff --git a/extensions/json/server/src/server.ts b/extensions/json/server/src/server.ts index 034116b7f6a..db697db3412 100644 --- a/extensions/json/server/src/server.ts +++ b/extensions/json/server/src/server.ts @@ -69,7 +69,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => { documentRangeFormattingProvider: true, documentFormattingProvider: true } - } + }; }); let workspaceContext = { @@ -79,20 +79,20 @@ let workspaceContext = { } return workspaceRelativePath; } -} +}; let telemetry = { log: (key: string, data: any) => { connection.sendNotification(TelemetryNotification.type, { key, data }); } -} +}; let request = (options: IXHROptions): Thenable => { if (Strings.startsWith(options.url, 'file://')) { let fsPath = URI.parse(options.url).fsPath; return new Promise((c, e) => { fs.readFile(fsPath, 'UTF-8', (err, result) => { - err ? e({ responseText: '', status: 404 }) : c({ responseText: result.toString(), status: 200 }) + err ? e({ responseText: '', status: 404 }) : c({ responseText: result.toString(), status: 200 }); }); }); } else if (Strings.startsWith(options.url, 'vscode://')) { @@ -105,11 +105,11 @@ let request = (options: IXHROptions): Thenable => { return { responseText: error.message, status: 404 - } + }; }); } return xhr(options); -} +}; let contributions = [ new ProjectJSONContribution(request), @@ -134,17 +134,17 @@ documents.onDidChangeContent((change) => { // The settings interface describe the server relevant settings part interface Settings { json: { - schemas: JSONSchemaSettings[] - }, + schemas: JSONSchemaSettings[]; + }; http : { - proxy: string, - proxyStrictSSL: boolean - } + proxy: string; + proxyStrictSSL: boolean; + }; } interface JSONSchemaSettings { - fileMatch?: string[], - url?: string, + fileMatch?: string[]; + url?: string; schema?: IJSONSchema; } @@ -153,9 +153,9 @@ let schemaAssociations : ISchemaAssociations = void 0; // The settings have changed. Is send on server activation as well. connection.onDidChangeConfiguration((change) => { - var settings = change.settings + var settings = change.settings; configureHttpRequests(settings.http && settings.http.proxy, settings.http && settings.http.proxyStrictSSL); - + jsonConfigurationSettings = settings.json && settings.json.schemas; updateConfiguration(); }); @@ -174,7 +174,7 @@ function updateConfiguration() { if (Array.isArray(association)) { association.forEach(url => { jsonSchemaService.registerExternalSchema(url, [pattern]); - }) + }); } } } diff --git a/extensions/json/src/jsonMain.ts b/extensions/json/src/jsonMain.ts index a2fa999de27..a3436c4bef1 100644 --- a/extensions/json/src/jsonMain.ts +++ b/extensions/json/src/jsonMain.ts @@ -37,7 +37,7 @@ export function activate(context: ExtensionContext) { let serverOptions: ServerOptions = { run: { module: serverModule, transport: TransportKind.ipc }, debug: { module: serverModule, transport: TransportKind.ipc, options: debugOptions } - } + }; // Options to control the language client let clientOptions: LanguageClientOptions = { @@ -48,7 +48,7 @@ export function activate(context: ExtensionContext) { configurationSection: ['json.schemas', 'http.proxy', 'http.proxyStrictSSL'], fileEvents: workspace.createFileSystemWatcher('**/.json') } - } + }; // Create the language client and start the client. let client = new LanguageClient('JSON Server', serverOptions, clientOptions); @@ -62,7 +62,7 @@ export function activate(context: ExtensionContext) { return workspace.openTextDocument(uri).then(doc => { return doc.getText(); }, error => { - return Promise.reject(error) + return Promise.reject(error); }); }); diff --git a/extensions/php/src/features/completionItemProvider.ts b/extensions/php/src/features/completionItemProvider.ts index 426649fb314..b9d2d093a2b 100644 --- a/extensions/php/src/features/completionItemProvider.ts +++ b/extensions/php/src/features/completionItemProvider.ts @@ -34,7 +34,7 @@ export default class PHPCompletionItemProvider implements CompletionItemProvider var matches = (name:string) => { return prefix.length === 0 || name.length > prefix.length && name.substr(0, prefix.length) === prefix; - } + }; for (var name in phpGlobals.globalvariables) { if (phpGlobals.globalvariables.hasOwnProperty(name) && matches(name)) { diff --git a/extensions/php/src/features/phpGlobals.ts b/extensions/php/src/features/phpGlobals.ts index 8f2016a692f..8ddfffae3a4 100644 --- a/extensions/php/src/features/phpGlobals.ts +++ b/extensions/php/src/features/phpGlobals.ts @@ -5,8 +5,8 @@ // file generated from PHP53Schema.xml using php-exclude_generate_php_globals.js -export interface IEntry { description?: string; signature?: string } -export interface IEntries { [name:string]:IEntry } +export interface IEntry { description?: string; signature?: string; } +export interface IEntries { [name:string]:IEntry; } export var globalfunctions: IEntries = { password_get_info: { diff --git a/extensions/php/src/features/validationProvider.ts b/extensions/php/src/features/validationProvider.ts index 48971619c1f..1024041f78a 100644 --- a/extensions/php/src/features/validationProvider.ts +++ b/extensions/php/src/features/validationProvider.ts @@ -68,14 +68,14 @@ namespace RunTrigger { export let strings = { onSave: 'onSave', onType: 'onType' - } + }; export let from = function(value: string): RunTrigger { if (value === 'onType') { return RunTrigger.onType; } else { return RunTrigger.onSave; } - } + }; } export default class PHPValidationProvider { @@ -175,10 +175,10 @@ export default class PHPValidationProvider { let diagnostic: vscode.Diagnostic = new vscode.Diagnostic( new vscode.Range(line, 0, line, Number.MAX_VALUE), message - ) + ); diagnostics.push(diagnostic); } - } + }; let options = vscode.workspace.rootPath ? { cwd: vscode.workspace.rootPath } : undefined; let args: string[]; diff --git a/extensions/typescript/src/features/bufferSyncSupport.ts b/extensions/typescript/src/features/bufferSyncSupport.ts index b2d41eb4759..64ee67ed011 100644 --- a/extensions/typescript/src/features/bufferSyncSupport.ts +++ b/extensions/typescript/src/features/bufferSyncSupport.ts @@ -95,7 +95,7 @@ export default class BufferSyncSupport { public reOpenDocuments(): void { Object.keys(this.syncedBuffers).forEach(key => { this.syncedBuffers[key].open(); - }) + }); } public dispose(): void { diff --git a/extensions/typescript/src/features/configuration.ts b/extensions/typescript/src/features/configuration.ts index 2bb94a79aa3..58149cee275 100644 --- a/extensions/typescript/src/features/configuration.ts +++ b/extensions/typescript/src/features/configuration.ts @@ -13,14 +13,14 @@ export interface IConfiguration { export var defaultConfiguration: IConfiguration = { useCodeSnippetsOnMethodSuggest: false -} +}; export function load(myPluginId: string): IConfiguration { let configuration = workspace.getConfiguration(myPluginId); - let useCodeSnippetsOnMethodSuggest = configuration.get('useCodeSnippetsOnMethodSuggest', defaultConfiguration.useCodeSnippetsOnMethodSuggest) + let useCodeSnippetsOnMethodSuggest = configuration.get('useCodeSnippetsOnMethodSuggest', defaultConfiguration.useCodeSnippetsOnMethodSuggest); return { useCodeSnippetsOnMethodSuggest - } + }; } \ No newline at end of file diff --git a/extensions/typescript/src/features/workspaceSymbolProvider.ts b/extensions/typescript/src/features/workspaceSymbolProvider.ts index cd22b4a6705..2dd85c97d37 100644 --- a/extensions/typescript/src/features/workspaceSymbolProvider.ts +++ b/extensions/typescript/src/features/workspaceSymbolProvider.ts @@ -21,7 +21,7 @@ _kindMapping['var'] = SymbolKind.Variable; export default class TypeScriptWorkspaceSymbolProvider implements WorkspaceSymbolProvider { private client: ITypescriptServiceClient; - private modeId: string + private modeId: string; public constructor(client: ITypescriptServiceClient, modeId: string) { this.client = client; diff --git a/extensions/typescript/src/utils/electron.ts b/extensions/typescript/src/utils/electron.ts index 9f456bb27d9..a0ea142b7db 100644 --- a/extensions/typescript/src/utils/electron.ts +++ b/extensions/typescript/src/utils/electron.ts @@ -101,7 +101,7 @@ export function fork(modulePath: string, args: string[], options: IForkOptions, } serverClosed = true; server.close(); - } + }; // Create the process let bootstrapperPath = path.join(__dirname, 'electronForkStart'); diff --git a/extensions/typescript/src/utils/electronForkStart.ts b/extensions/typescript/src/utils/electronForkStart.ts index fe349fa856b..9d8735d2dbc 100644 --- a/extensions/typescript/src/utils/electronForkStart.ts +++ b/extensions/typescript/src/utils/electronForkStart.ts @@ -23,7 +23,7 @@ var log = (function() { return; } fs.appendFileSync(LOG_LOCATION, str + '\n'); - } + }; })(); var stdInPipeName = process.env['STDIN_PIPE_NAME']; diff --git a/extensions/typescript/src/utils/wireProtocol.ts b/extensions/typescript/src/utils/wireProtocol.ts index c171ea6822f..5dad22dabb8 100644 --- a/extensions/typescript/src/utils/wireProtocol.ts +++ b/extensions/typescript/src/utils/wireProtocol.ts @@ -189,7 +189,7 @@ export class Writer { '\r\n\r\n', json, '\r\n' - ] + ]; this.writable.write(buffer.join(''), 'utf8'); } } \ No newline at end of file diff --git a/src/vs/base/common/marked/simpleMarkedWorker.ts b/src/vs/base/common/marked/simpleMarkedWorker.ts index 6ee052ba553..7ff45ea3615 100644 --- a/src/vs/base/common/marked/simpleMarkedWorker.ts +++ b/src/vs/base/common/marked/simpleMarkedWorker.ts @@ -10,7 +10,7 @@ import {marked, MarkedOptions} from 'vs/base/common/marked/marked'; function link(href, title, text): string { - return `${text}` + return `${text}`; } @@ -38,4 +38,4 @@ export const value = { } }); } -} +}; diff --git a/src/vs/base/common/parsers.ts b/src/vs/base/common/parsers.ts index 925496f9fdd..6fd382a2eb6 100644 --- a/src/vs/base/common/parsers.ts +++ b/src/vs/base/common/parsers.ts @@ -93,7 +93,6 @@ export abstract class Parser { destination[key] = sourceValue; } else { if (overwrite) { - let source if (Types.isObject(destValue) && Types.isObject(sourceValue)) { this.merge(destValue, sourceValue, overwrite); } else { diff --git a/src/vs/base/common/scorer.ts b/src/vs/base/common/scorer.ts index 59cbc3b2303..4126efe23d4 100644 --- a/src/vs/base/common/scorer.ts +++ b/src/vs/base/common/scorer.ts @@ -101,7 +101,7 @@ function isUpper(code: number): boolean { */ export function matches(target: string, queryLower: string): boolean { if (!target || !queryLower) { - return false // return early if target or query are undefined + return false; // return early if target or query are undefined } const queryLen = queryLower.length; diff --git a/src/vs/languages/json/common/jsonIntellisense.ts b/src/vs/languages/json/common/jsonIntellisense.ts index 555fa88b14a..31591666c98 100644 --- a/src/vs/languages/json/common/jsonIntellisense.ts +++ b/src/vs/languages/json/common/jsonIntellisense.ts @@ -21,7 +21,7 @@ export class JSONIntellisense { private schemaService: SchemaService.IJSONSchemaService; private requestService: IRequestService; - private contributions: JsonWorker.IJSONWorkerContribution[] + private contributions: JsonWorker.IJSONWorkerContribution[]; constructor(schemaService: SchemaService.IJSONSchemaService, requestService: IRequestService, contributions: JsonWorker.IJSONWorkerContribution[]) { this.schemaService = schemaService; diff --git a/src/vs/languages/json/common/jsonSchemaService.ts b/src/vs/languages/json/common/jsonSchemaService.ts index 66cc353e062..00131174315 100644 --- a/src/vs/languages/json/common/jsonSchemaService.ts +++ b/src/vs/languages/json/common/jsonSchemaService.ts @@ -282,7 +282,7 @@ export class JSONSchemaService implements IJSONSchemaService { var fpa = this.getOrAddFilePatternAssociation(pattern); associations.forEach(schemaId => { var id = this.normalizeId(schemaId); - fpa.addSchema(id) + fpa.addSchema(id); }); } } @@ -399,7 +399,7 @@ export class JSONSchemaService implements IJSONSchemaService { resolveErrors.push(nls.localize('json.schema.invalidref', '$ref \'{0}\' in {1} can not be resolved.', linkPath, linkedSchema.id)); } delete node.$ref; - } + }; var resolveExternalLink = (node: any, uri: string, linkPath: string): WinJS.Promise => { return this.getOrAddSchemaHandle(uri).getUnresolvedSchema().then(unresolvedSchema => { @@ -410,7 +410,7 @@ export class JSONSchemaService implements IJSONSchemaService { resolveLink(node, unresolvedSchema.schema, linkPath); return resolveRefs(node, unresolvedSchema.schema); }); - } + }; var resolveRefs = (node:any, parentSchema: any) : WinJS.Promise => { var toWalk = [ node ]; @@ -444,7 +444,7 @@ export class JSONSchemaService implements IJSONSchemaService { } } return WinJS.Promise.join(openPromises); - } + }; return resolveRefs(schema, schema).then(_ => new ResolvedSchema(schema, resolveErrors)); } @@ -485,7 +485,7 @@ export class JSONSchemaService implements IJSONSchemaService { } else { var combinedSchema: IJSONSchema = { allOf: schemaIds.map(schemaId => ({ $ref: schemaId })) - } + }; return this.addSchemaHandle(combinedSchemaId, combinedSchema); } } diff --git a/src/vs/languages/typescript/common/lineMap.ts b/src/vs/languages/typescript/common/lineMap.ts index 8b21aa4aec6..e0276ef410d 100644 --- a/src/vs/languages/typescript/common/lineMap.ts +++ b/src/vs/languages/typescript/common/lineMap.ts @@ -54,7 +54,7 @@ namespace LineMap { startColumn: startPosition.column, endLineNumber: endPosition.lineNumber, endColumn: endPosition.column, - } + }; } return {