From 8883fcd03b7afd2eba21ea845bdd2dfbaf3d4c38 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Thu, 19 Nov 2015 12:56:08 +0100 Subject: [PATCH] Leading whitespace fixes --- build/lib/style.js | 9 +- extensions/csharp-o/src/omnisharpServer.ts | 6 +- .../csharp-o/src/omnisharpServerLauncher.ts | 2 +- .../src/features/bufferSyncSupport.ts | 2 +- .../typescript/src/features/configuration.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 +- .../typescript/src/features/previewer.ts | 3 +- .../src/features/referenceProvider.ts | 2 +- .../typescript/src/features/renameProvider.ts | 2 +- .../src/features/signatureHelpProvider.ts | 2 +- .../src/features/workspaceSymbolProvider.ts | 2 +- gulpfile.js | 25 +- src/vs/base/browser/ui/button/button.css | 2 +- .../browser/ui/contextview/contextview.css | 6 +- .../browser/ui/messagelist/messageList.css | 2 +- .../ui/resourceviewer/resourceviewer.css | 30 +- src/vs/base/common/bits/bits.ts | 26 +- src/vs/base/common/event.ts | 34 +- src/vs/base/common/iterator.ts | 2 +- src/vs/base/common/json.ts | 2 +- src/vs/base/common/numbers.ts | 12 +- src/vs/base/common/processes.ts | 2 +- src/vs/base/common/sortedList.ts | 42 +- .../standalone/standaloneCodeEditor.ts | 2 +- .../browser/widget/media/default-theme.css | 8 +- .../contrib/quickFix/browser/quickFix.css | 4 +- .../contrib/suggest/browser/suggest.css | 6 +- .../zoneWidget/browser/peekViewWidget.css | 2 +- src/vs/editor/standalone-languages/jade.ts | 8 +- .../standalone-languages/objective-c.ts | 8 +- .../editor/standalone-languages/powershell.ts | 6 +- src/vs/editor/standalone-languages/python.ts | 2 +- src/vs/editor/standalone-languages/ruby.ts | 640 +++++++++--------- .../languages/css/common/parser/cssParser.ts | 2 +- .../css/test/common/css-worker.test.ts | 6 +- src/vs/languages/html/common/htmlTags.ts | 2 +- .../html/test/common/html-worker.test.ts | 16 +- .../contributions/bowerJSONContribution.ts | 10 +- .../contributions/packageJSONContribution.ts | 18 +- .../contributions/projectJSONContribution.ts | 2 +- .../json/common/jsonSchemaService.ts | 16 +- .../json/test/common/jsonworker.test.ts | 4 +- .../languages/json/test/node/schema.test.ts | 8 +- .../less/common/parser/lessParser.ts | 2 +- .../less/test/common/colorizer.test.ts | 2 +- .../less/test/common/intellisense.test.ts | 2 +- src/vs/languages/markdown/common/markdown.css | 4 +- .../markdown/test/common/markdown.test.ts | 2 +- src/vs/languages/php/test/common/php.test.ts | 4 +- .../plaintext/test/common/plainText.test.ts | 2 +- .../languages/razor/test/common/razor.test.ts | 2 +- src/vs/languages/sass/common/sass.ts | 12 +- .../languages/sass/test/common/parser.test.ts | 12 +- .../sass/test/common/sass-worker.test.ts | 8 +- .../languages/sass/test/common/sass.test.ts | 4 +- .../typescript/common/features/quickFix.ts | 36 +- .../typescript/common/features/rename.ts | 2 +- .../common/lint/rules/typescript.ts | 2 +- .../test/common/js/requireRewriter.test.ts | 2 +- .../test/common/tokenization.test.ts | 2 +- .../browser/contextMenuHandler.css | 2 +- .../common/instantiationService.ts | 6 +- .../test/common/keybindingService.test.ts | 36 +- .../common/abstractTelemetryService.ts | 6 +- .../test/node/telemetryService.test.ts | 14 +- .../workbench/browser/media/vs-dark-theme.css | 4 +- src/vs/workbench/browser/media/vs-theme.css | 2 +- .../activitybar/media/activityaction.css | 24 +- .../browser/parts/editor/media/sidebyside.css | 4 +- .../parts/sidebar/media/sidebarpart.css | 6 +- src/vs/workbench/electron-main/bootstrap.js | 4 +- .../debug/browser/media/debugViewlet.css | 2 +- .../electron-browser/extensions.css | 6 +- .../git/browser/views/changes/changesView.ts | 8 +- .../electron-browser/snippets.contribution.ts | 2 +- .../parts/tasks/node/processRunnerSystem.ts | 2 +- .../tasks/test/node/configuration.test.ts | 10 +- .../node/nodeAppInsightsTelemetryAppender.ts | 10 +- test/all.js | 4 +- test/index.html | 16 +- 84 files changed, 639 insertions(+), 626 deletions(-) diff --git a/build/lib/style.js b/build/lib/style.js index 3978e3b3fa4..d9d890d37ce 100644 --- a/build/lib/style.js +++ b/build/lib/style.js @@ -15,7 +15,6 @@ module.exports = function (opts) { if (opts.whitespace) { var lines = contents.split(/\r\n|\r|\n/); - var hadErrorLineNumber = 0; for (var i = 0, len = lines.length; i < len; i++) { var line = lines[i]; if (line.length === 0) { @@ -33,15 +32,9 @@ module.exports = function (opts) { // empty line continue; } else { - // console.log(file.path + '(' + hadErrorLineNumber + ',1): Mixed whitespace indentation'); - hadErrorLineNumber = i + 1; - break; + console.log(file.path + '(' + (i + 1) + ',1): Mixed whitespace indentation'); } } - - if (hadErrorLineNumber) { - console.log(file.path + '(' + hadErrorLineNumber + ',1): Mixed whitespace indentation'); - } } } else { var lines = contents.split(/\r\n|\r|\n/); diff --git a/extensions/csharp-o/src/omnisharpServer.ts b/extensions/csharp-o/src/omnisharpServer.ts index f3cc83f7c22..153d9a2176f 100644 --- a/extensions/csharp-o/src/omnisharpServer.ts +++ b/extensions/csharp-o/src/omnisharpServer.ts @@ -188,9 +188,9 @@ export abstract class OmnisharpServer { ret = Promise.resolve(undefined); } else if (/^win/.test(process.platform)) { - // when killing a process in windows its child - // processes are *not* killed but become root - // processes. Therefore we use TASKKILL.EXE + // when killing a process in windows its child + // processes are *not* killed but become root + // processes. Therefore we use TASKKILL.EXE ret = new Promise((resolve, reject) => { var killer = exec(`taskkill /F /T /PID ${this._serverProcess.pid}`, function (err, stdout, stderr) { if (err) { diff --git a/extensions/csharp-o/src/omnisharpServerLauncher.ts b/extensions/csharp-o/src/omnisharpServerLauncher.ts index 55f7cb07ca3..618f26b71fe 100644 --- a/extensions/csharp-o/src/omnisharpServerLauncher.ts +++ b/extensions/csharp-o/src/omnisharpServerLauncher.ts @@ -35,7 +35,7 @@ export default function launch(cwd: string, args: string[]):Promise < { process: } catch (err) { reject(err); } - }); + }); } function launchWindows(cwd: string, args: string[]): Promise<{ process: ChildProcess, command: string }> { diff --git a/extensions/typescript/src/features/bufferSyncSupport.ts b/extensions/typescript/src/features/bufferSyncSupport.ts index 0e3aef9f42c..a13c310c81e 100644 --- a/extensions/typescript/src/features/bufferSyncSupport.ts +++ b/extensions/typescript/src/features/bufferSyncSupport.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ - 'use strict'; +'use strict'; import { workspace, TextDocument, TextDocumentChangeEvent, TextDocumentContentChangeEvent, Disposable } from 'vscode'; import * as Proto from '../protocol'; diff --git a/extensions/typescript/src/features/configuration.ts b/extensions/typescript/src/features/configuration.ts index 39151825775..673f5e5e35c 100644 --- a/extensions/typescript/src/features/configuration.ts +++ b/extensions/typescript/src/features/configuration.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ - 'use strict'; +'use strict'; import { workspace } from 'vscode'; diff --git a/extensions/typescript/src/features/definitionProvider.ts b/extensions/typescript/src/features/definitionProvider.ts index 72418eeebcf..c7150b786a2 100644 --- a/extensions/typescript/src/features/definitionProvider.ts +++ b/extensions/typescript/src/features/definitionProvider.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ - 'use strict'; +'use strict'; import { workspace, DefinitionProvider, TextDocument, Position, Range, CancellationToken, Location } from 'vscode'; diff --git a/extensions/typescript/src/features/documentHighlightProvider.ts b/extensions/typescript/src/features/documentHighlightProvider.ts index 2f82fb6271e..02eb5052e4e 100644 --- a/extensions/typescript/src/features/documentHighlightProvider.ts +++ b/extensions/typescript/src/features/documentHighlightProvider.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ - 'use strict'; +'use strict'; import { workspace, DocumentHighlightProvider, DocumentHighlight, DocumentHighlightKind, TextDocument, Position, Range, CancellationToken } from 'vscode'; diff --git a/extensions/typescript/src/features/documentSymbolProvider.ts b/extensions/typescript/src/features/documentSymbolProvider.ts index 56488c9dfe7..3336709bc6a 100644 --- a/extensions/typescript/src/features/documentSymbolProvider.ts +++ b/extensions/typescript/src/features/documentSymbolProvider.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ - 'use strict'; +'use strict'; import { workspace, DocumentSymbolProvider, SymbolInformation, SymbolKind, TextDocument, Position, Range, CancellationToken } from 'vscode'; diff --git a/extensions/typescript/src/features/formattingProvider.ts b/extensions/typescript/src/features/formattingProvider.ts index e96691b0249..814ba82b9d0 100644 --- a/extensions/typescript/src/features/formattingProvider.ts +++ b/extensions/typescript/src/features/formattingProvider.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ - 'use strict'; +'use strict'; import { workspace, DocumentRangeFormattingEditProvider, OnTypeFormattingEditProvider, FormattingOptions, TextDocument, Position, Range, CancellationToken, TextEdit } from 'vscode'; diff --git a/extensions/typescript/src/features/hoverProvider.ts b/extensions/typescript/src/features/hoverProvider.ts index 4aaf22d52d6..7a3c0a0e8b8 100644 --- a/extensions/typescript/src/features/hoverProvider.ts +++ b/extensions/typescript/src/features/hoverProvider.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ - 'use strict'; +'use strict'; import { workspace, HoverProvider, Hover, TextDocument, Position, Range, CancellationToken } from 'vscode'; diff --git a/extensions/typescript/src/features/previewer.ts b/extensions/typescript/src/features/previewer.ts index 2d01b6029af..00d68c838a7 100644 --- a/extensions/typescript/src/features/previewer.ts +++ b/extensions/typescript/src/features/previewer.ts @@ -2,7 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ - 'use strict'; + +'use strict'; import * as Proto from '../protocol'; diff --git a/extensions/typescript/src/features/referenceProvider.ts b/extensions/typescript/src/features/referenceProvider.ts index 3e35885491a..10ebbe6e3f5 100644 --- a/extensions/typescript/src/features/referenceProvider.ts +++ b/extensions/typescript/src/features/referenceProvider.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ - 'use strict'; +'use strict'; import { workspace, ReferenceProvider, Location, TextDocument, Position, Range, CancellationToken } from 'vscode'; diff --git a/extensions/typescript/src/features/renameProvider.ts b/extensions/typescript/src/features/renameProvider.ts index f9d06aa18fa..2366ee11697 100644 --- a/extensions/typescript/src/features/renameProvider.ts +++ b/extensions/typescript/src/features/renameProvider.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ - 'use strict'; +'use strict'; import { workspace, RenameProvider, WorkspaceEdit, TextDocument, Position, Range, CancellationToken } from 'vscode'; diff --git a/extensions/typescript/src/features/signatureHelpProvider.ts b/extensions/typescript/src/features/signatureHelpProvider.ts index 0417723f1aa..9a434a95cb5 100644 --- a/extensions/typescript/src/features/signatureHelpProvider.ts +++ b/extensions/typescript/src/features/signatureHelpProvider.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ - 'use strict'; +'use strict'; import { workspace, SignatureHelpProvider, SignatureHelp, SignatureInformation, ParameterInformation, TextDocument, Position, CancellationToken } from 'vscode'; diff --git a/extensions/typescript/src/features/workspaceSymbolProvider.ts b/extensions/typescript/src/features/workspaceSymbolProvider.ts index 23f97c8c0c0..d2a187e6df4 100644 --- a/extensions/typescript/src/features/workspaceSymbolProvider.ts +++ b/extensions/typescript/src/features/workspaceSymbolProvider.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ - 'use strict'; +'use strict'; import { workspace, Uri, WorkspaceSymbolProvider, SymbolInformation, SymbolKind, TextDocument, Position, Range, CancellationToken } from 'vscode'; diff --git a/gulpfile.js b/gulpfile.js index 4dcae303a70..86b46346b6a 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -134,13 +134,32 @@ gulp.task('fix-eol-style', function() { return gulp.src(LINE_FEED_FILES, { base: '.' }).pipe(style({})).pipe(gulp.dest('.')); }); var WHITESPACE_FILES = LINE_FEED_FILES.concat([ - '!**/lib/**' + '!**/lib/**', + '!**/*.d.ts', + '!extensions/typescript/server/**', + '!test/assert.js', + '!**/octicons/**', + '!**/vs/languages/sass/test/common/example.scss', + '!**/vs/languages/less/common/parser/less.grammar.txt', + '!**/vs/languages/css/common/buildscripts/css-schema.xml', + '!**/vs/languages/markdown/common/raw.marked.js', + '!**/vs/base/common/winjs.base.raw.js', + '!**/vs/base/node/terminateProcess.sh', + '!extensions/csharp-o/gulpfile.js', + '!**/vs/base/node/terminateProcess.sh', + '!**/vs/text.js', + '!**/vs/nls.js', + '!**/vs/css.js', + '!**/vs/loader.js', + '!extensions/**/snippets/**', + '!extensions/**/syntaxes/**', + '!extensions/**/themes/**', ]); gulp.task('whitespace-style', function() { - return gulp.src(LINE_FEED_FILES).pipe(style({complain:true, whitespace:true})); + return gulp.src(WHITESPACE_FILES).pipe(style({complain:true, whitespace:true})); }); gulp.task('fix-whitespace-style', function() { - return gulp.src(LINE_FEED_FILES, { base: '.' }).pipe(style({whitespace:true})).pipe(gulp.dest('.')); + return gulp.src(WHITESPACE_FILES, { base: '.' }).pipe(style({whitespace:true})).pipe(gulp.dest('.')); }); gulp.task('copyrights', function() { diff --git a/src/vs/base/browser/ui/button/button.css b/src/vs/base/browser/ui/button/button.css index c262bce7baf..7ace3b45985 100644 --- a/src/vs/base/browser/ui/button/button.css +++ b/src/vs/base/browser/ui/button/button.css @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - + .monaco-button { -moz-box-sizing: border-box; box-sizing: border-box; diff --git a/src/vs/base/browser/ui/contextview/contextview.css b/src/vs/base/browser/ui/contextview/contextview.css index fd919e22dcc..58bb251b7c9 100644 --- a/src/vs/base/browser/ui/contextview/contextview.css +++ b/src/vs/base/browser/ui/contextview/contextview.css @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - + .context-view { position: absolute; z-index: 1000; @@ -15,7 +15,7 @@ margin-top: 4px; margin-right: 4px; max-width: 350px; - + -webkit-animation: fadeIn 0.15s linear; -o-animation: fadeIn 0.15s linear; -moz-animation: fadeIn 0.15s linear; @@ -30,7 +30,7 @@ border-color: transparent; border-style: solid; } - + .context-view.bottom.right .tooltip:before { top: -12px; right: 12px; diff --git a/src/vs/base/browser/ui/messagelist/messageList.css b/src/vs/base/browser/ui/messagelist/messageList.css index 4dd2ee59fb2..29e3afb272b 100644 --- a/src/vs/base/browser/ui/messagelist/messageList.css +++ b/src/vs/base/browser/ui/messagelist/messageList.css @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - + .global-message-list { font-size: 12px; position: absolute; diff --git a/src/vs/base/browser/ui/resourceviewer/resourceviewer.css b/src/vs/base/browser/ui/resourceviewer/resourceviewer.css index 004d1de692e..ca11bf890bc 100644 --- a/src/vs/base/browser/ui/resourceviewer/resourceviewer.css +++ b/src/vs/base/browser/ui/resourceviewer/resourceviewer.css @@ -3,21 +3,21 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - .monaco-resource-viewer img { - border: 1px solid; - max-width: 100%; - max-height: 100%; - } +.monaco-resource-viewer img { + border: 1px solid; + max-width: 100%; + max-height: 100%; +} - .vs .monaco-resource-viewer img { - border-color: #F3F3F3; - } +.vs .monaco-resource-viewer img { + border-color: #F3F3F3; +} - .vs-dark .monaco-resource-viewer img { - border-color: #252526; - } +.vs-dark .monaco-resource-viewer img { + border-color: #252526; +} - .monaco-resource-viewer video { - max-width: 100%; - max-height: 100%; - } \ No newline at end of file +.monaco-resource-viewer video { + max-width: 100%; + max-height: 100%; +} \ No newline at end of file diff --git a/src/vs/base/common/bits/bits.ts b/src/vs/base/common/bits/bits.ts index 5a3d7b6d8e7..5a824ab1c46 100644 --- a/src/vs/base/common/bits/bits.ts +++ b/src/vs/base/common/bits/bits.ts @@ -15,26 +15,26 @@ export function toHexString(value: number, bitsize: number = 32): string { export function leftRotate(value: number, bits: number, totalBits: number = 32): number { // delta + bits = totalBits var delta = totalBits - bits; - + // All ones, expect `delta` zeros aligned to the right var mask = ~((1 << delta) - 1); - + // Join (value left-shifted `bits` bits) with (masked value right-shifted `delta` bits) return ((value << bits) | ((mask & value) >>> delta)) >>> 0; } export function multiply64(a: number, b: number): number[] { /* A1 A0 => A - B1 B0 => B - B0 * A1 B0 * A0 - B1 * A1 B1 * A0 - C3 C2 C1 C0 => C + * B1 B0 => B + * B0 * A1 B0 * A0 + * B1 * A1 B1 * A0 + * C3 C2 C1 C0 => C */ - + var a0 = a & 0xffff, a1 = a >>> 16; var b0 = b & 0xffff, b1 = b >>> 16; var c0 = 0, c1 = 0, c2 = 0, c3 = 0; - + var x = b0 * a0; c0 += x & 0xffff; c1 += x >>> 16; @@ -42,20 +42,20 @@ export function multiply64(a: number, b: number): number[] { x = b0 * a1; c1 += x & 0xffff; c2 += x >>> 16; - + x = b1 * a0; c1 += x & 0xffff; c2 += x >>> 16; - + c2 += c1 >>> 16; c1 = c1 & 0xffff; - + x = b1 * a1; c2 += x & 0xffff; c3 += x >>> 16; - + c3 += c2 >>> 16; c2 = c2 & 0xffff; - + return [(c3 << 16 | c2) >>> 0, (c1 << 16 | c0) >>> 0]; } diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts index 53e7cd1c4bf..ae9a1dbf2e4 100644 --- a/src/vs/base/common/event.ts +++ b/src/vs/base/common/event.ts @@ -121,23 +121,23 @@ export class Emitter { * Creates an Event which is backed-up by the event emitter. This allows * to use the existing eventing pattern and is likely using less memeory. * Sample: - - class Document { - - private _eventbus = new EventEmitter(); - - public onDidChange = fromEventEmitter(this._eventbus, 'changed'); - - // getter-style - // get onDidChange(): Event<(value:string)=>any> { - // cache fromEventEmitter result and return - // } - - private _doIt() { - // ... - this._eventbus.emit('changed', value) - } - } + * + * class Document { + * + * private _eventbus = new EventEmitter(); + * + * public onDidChange = fromEventEmitter(this._eventbus, 'changed'); + * + * // getter-style + * // get onDidChange(): Event<(value:string)=>any> { + * // cache fromEventEmitter result and return + * // } + * + * private _doIt() { + * // ... + * this._eventbus.emit('changed', value) + * } + * } */ export function fromEventEmitter(emitter: EventEmitter, eventType: string): Event { return function (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[]): IDisposable { diff --git a/src/vs/base/common/iterator.ts b/src/vs/base/common/iterator.ts index 085fb5b5d66..970d9943b4a 100644 --- a/src/vs/base/common/iterator.ts +++ b/src/vs/base/common/iterator.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - + 'use strict'; export interface IIterator { diff --git a/src/vs/base/common/json.ts b/src/vs/base/common/json.ts index 02f9b928299..25ff8df49cc 100644 --- a/src/vs/base/common/json.ts +++ b/src/vs/base/common/json.ts @@ -86,7 +86,7 @@ export function createScanner(text:string, ignoreTrivia:boolean = false):JSONSca pos++; } else { pos++; - while (pos < text.length && isDigit(text.charCodeAt(pos))) { + while (pos < text.length && isDigit(text.charCodeAt(pos))) { pos++; } } diff --git a/src/vs/base/common/numbers.ts b/src/vs/base/common/numbers.ts index 44e286e4415..4b32bc9a4f5 100644 --- a/src/vs/base/common/numbers.ts +++ b/src/vs/base/common/numbers.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - + 'use strict'; import types = require('vs/base/common/types'); @@ -13,7 +13,7 @@ export function count(to: number, callback: NumberCallback): void; export function count(from: number, to: number, callback: NumberCallback): void; export function count(fromOrTo: number, toOrCallback?: NumberCallback | number, callback?: NumberCallback): any { var from: number, to: number; - + if (types.isNumber(toOrCallback)) { from = fromOrTo; to = toOrCallback; @@ -22,10 +22,10 @@ export function count(fromOrTo: number, toOrCallback?: NumberCallback | number, to = fromOrTo; callback = toOrCallback; } - + var op = from <= to ? (i: number) => i + 1 : (i: number) => i - 1; var cmp = from <= to ? (a: number, b: number) => a < b : (a: number, b: number) => a > b; - + for (var i = from; cmp(i, to); i = op(i)) { callback(i); } @@ -36,12 +36,12 @@ export function countToArray(from: number, to: number): number[]; export function countToArray(fromOrTo: number, to?: number): number[] { var result: number[] = []; var fn = (i: number) => result.push(i); - + if (types.isUndefined(to)) { count(fromOrTo, fn); } else { count(fromOrTo, to, fn); } - + return result; } diff --git a/src/vs/base/common/processes.ts b/src/vs/base/common/processes.ts index 7f562f225dc..62fed0d2b66 100644 --- a/src/vs/base/common/processes.ts +++ b/src/vs/base/common/processes.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - 'use strict'; +'use strict'; import NLS = require('vs/nls'); diff --git a/src/vs/base/common/sortedList.ts b/src/vs/base/common/sortedList.ts index 75a954832bd..7f8de266c5f 100644 --- a/src/vs/base/common/sortedList.ts +++ b/src/vs/base/common/sortedList.ts @@ -23,60 +23,60 @@ export interface ISortedList extends IIterable; + getValues(): IIterator; /** * Gets the value at the specified index. * Returns null if index is out of bounds. * O(1) */ - getValueByIndex(index: number): TValue; + getValueByIndex(index: number): TValue; /** * Gets the key at the specified index. * Returns null if index is out of bounds. * O(1) */ - getKey(index: number): TKey; + getKey(index: number): TKey; /** * Gets an iterator over keys. * O(1) */ - getKeys(): IIterator; + getKeys(): IIterator; - /** - * Returns the zero-based index of the specified key in a SortedList object. - * Returns -1 if the key is not found. - * O(log n) - */ - indexOfKey(key: TKey): number; + /** + * Returns the zero-based index of the specified key in a SortedList object. + * Returns -1 if the key is not found. + * O(log n) + */ + indexOfKey(key: TKey): number; /** * Adds the specified key and value to the sorted list. * O(n) */ - add(key: TKey, value: TValue): void; + add(key: TKey, value: TValue): void; /** * Removes a value from the sorted list. * Returns true if the value got removed, false otherwise. * O(n) */ - remove(key: TKey): boolean; + remove(key: TKey): boolean; } export interface KeyValue { @@ -130,7 +130,7 @@ export class SortedList implements ISortedList { } var indexOfKey = this.indexOfKey(key); if (indexOfKey >= 0) { - return this.values[indexOfKey]; + return this.values[indexOfKey]; } return null; @@ -154,7 +154,7 @@ export class SortedList implements ISortedList { var position = 0; while (position < this.keys.length && this.comparator(key, this.keys[position]) > 0) { - position++; + position++; } this.keys.splice(position, 0, key); @@ -167,8 +167,8 @@ export class SortedList implements ISortedList { } var indexOfKey = this.indexOfKey(key); if (indexOfKey >= 0) { - this.values.splice(indexOfKey, 1); - this.keys.splice(indexOfKey, 1); + this.values.splice(indexOfKey, 1); + this.keys.splice(indexOfKey, 1); } return indexOfKey >= 0; @@ -210,7 +210,7 @@ class SortedListIterator implements IIterator implements IIterator { return this.index + 1 < this.values.length; } - public reset(): void { + public reset(): void { this.index = -1; } diff --git a/src/vs/editor/browser/standalone/standaloneCodeEditor.ts b/src/vs/editor/browser/standalone/standaloneCodeEditor.ts index 1d3f1cb4d40..352171a1316 100644 --- a/src/vs/editor/browser/standalone/standaloneCodeEditor.ts +++ b/src/vs/editor/browser/standalone/standaloneCodeEditor.ts @@ -405,7 +405,7 @@ export function configureMode(modeId: string, options: any): void { export function registerWorkerParticipant(modeId:string, moduleName:string, ctorName:string): void { var modeRegistry = Registry.as(Extensions.EditorModes); - modeRegistry.registerWorkerParticipant(modeId, createAsyncDescriptor0(moduleName, ctorName)); + modeRegistry.registerWorkerParticipant(modeId, createAsyncDescriptor0(moduleName, ctorName)); } export function getAPI(): typeof vscode { diff --git a/src/vs/editor/browser/widget/media/default-theme.css b/src/vs/editor/browser/widget/media/default-theme.css index a1dfe1b4143..70c787a5ead 100644 --- a/src/vs/editor/browser/widget/media/default-theme.css +++ b/src/vs/editor/browser/widget/media/default-theme.css @@ -9,10 +9,10 @@ line-height: 19px; color: #333; /* - WORKAROUND: - Because of bug https://monacotools.visualstudio.com/DefaultCollection/Monaco/_workitems/edit/13254 - we are *not* using the color white (or #ffffff, rgba(255,255,255)) but something very close to white. - */ + * WORKAROUND: + * Because of bug https://monacotools.visualstudio.com/DefaultCollection/Monaco/_workitems/edit/13254 + * we are *not* using the color white (or #ffffff, rgba(255,255,255)) but something very close to white. + */ background: #fffffe; } diff --git a/src/vs/editor/contrib/quickFix/browser/quickFix.css b/src/vs/editor/contrib/quickFix/browser/quickFix.css index 54d1339ca47..acb62363de8 100644 --- a/src/vs/editor/contrib/quickFix/browser/quickFix.css +++ b/src/vs/editor/contrib/quickFix/browser/quickFix.css @@ -99,7 +99,7 @@ } /* Dark theme */ - .monaco-editor.vs-dark .quickfix-widget { +.monaco-editor.vs-dark .quickfix-widget { background-color: #2D2D30; border: 1px solid rgb(69, 69, 69); } @@ -110,7 +110,7 @@ /* High Contrast Theming */ - .monaco-editor.hc-black .quickfix-widget { +.monaco-editor.hc-black .quickfix-widget { background-color: #0C141F; border: 2px solid #6FC3DF; } diff --git a/src/vs/editor/contrib/suggest/browser/suggest.css b/src/vs/editor/contrib/suggest/browser/suggest.css index b3ce4424606..710b85633f1 100644 --- a/src/vs/editor/contrib/suggest/browser/suggest.css +++ b/src/vs/editor/contrib/suggest/browser/suggest.css @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ /* Suggest */ - .monaco-editor .suggest-widget { +.monaco-editor .suggest-widget { background-color: #F3F3F3; font-size: 12px; border: 1px solid rgb(200, 200, 200); @@ -145,7 +145,7 @@ } /* Dark theme */ - .monaco-editor.vs-dark .suggest-widget { +.monaco-editor.vs-dark .suggest-widget { background-color: #2D2D30; border: 1px solid rgb(69, 69, 69); } @@ -190,7 +190,7 @@ /* High Contrast Theming */ - .monaco-editor.hc-black .suggest-widget { +.monaco-editor.hc-black .suggest-widget { background-color: #0C141F; border: 2px solid #6FC3DF; } diff --git a/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.css b/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.css index 57cccb0b6c6..18dbd870bf8 100644 --- a/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.css +++ b/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.css @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - + .monaco-editor .peekview-widget .head { background-color: #fff; border-top: 1px solid #007ACC; diff --git a/src/vs/editor/standalone-languages/jade.ts b/src/vs/editor/standalone-languages/jade.ts index 9e48b9ebaf6..bcc0a419c10 100644 --- a/src/vs/editor/standalone-languages/jade.ts +++ b/src/vs/editor/standalone-languages/jade.ts @@ -8,9 +8,9 @@ import {ILanguage} from './types'; export var language = { - displayName: 'Jade', - name: 'jade', - defaultToken: '', + displayName: 'Jade', + name: 'jade', + defaultToken: '', ignoreCase: true, @@ -76,7 +76,7 @@ export var language = { { include: '@whitespace' }, // keywords - [/[a-zA-Z_$][\w$]*/, { cases: { '@keywords': {token:'keyword.$0'}, + [/[a-zA-Z_$][\w$]*/, { cases: { '@keywords': {token:'keyword.$0'}, '@default': '' } }], // delimiters and operators diff --git a/src/vs/editor/standalone-languages/objective-c.ts b/src/vs/editor/standalone-languages/objective-c.ts index 2aae250791f..86c5e50f4a5 100644 --- a/src/vs/editor/standalone-languages/objective-c.ts +++ b/src/vs/editor/standalone-languages/objective-c.ts @@ -44,7 +44,7 @@ export var language = { '@selector', '@synthesize', - '__declspec', + '__declspec', 'assign', 'auto', @@ -138,7 +138,7 @@ export var language = { [/[{}\[\]()<>]/, '@brackets'], [/[a-zA-Z@#]\w*/, { cases: { '@keywords': 'keyword', - '@default': 'identifier' } }], + '@default': 'identifier' } }], [/[<>=\\+\\-\\*\\/\\^\\|\\~,]|and\\b|or\\b|not\\b]/, 'operator'], ], @@ -158,11 +158,11 @@ export var language = { ], numbers: [ - [/0[xX][0-9a-fA-F]*(_?[0-9a-fA-F])*/, 'number.hex'], + [/0[xX][0-9a-fA-F]*(_?[0-9a-fA-F])*/, 'number.hex'], [/@decimal((\.@decpart)?([eE][\-+]?@decpart)?)[fF]*/, { cases: { '(\\d)*': 'number', '$0':'number.float' }} ] - ], + ], // Recognize strings, including those broken across lines with \ (but not without) strings: [ diff --git a/src/vs/editor/standalone-languages/powershell.ts b/src/vs/editor/standalone-languages/powershell.ts index 820936402a9..5b6519e967d 100644 --- a/src/vs/editor/standalone-languages/powershell.ts +++ b/src/vs/editor/standalone-languages/powershell.ts @@ -56,7 +56,7 @@ export var language = { root: [ // commands and keywords - [/[a-zA-Z_][\w-]*/, { cases: { '@keywords': {token:'keyword.$0'}, + [/[a-zA-Z_][\w-]*/, { cases: { '@keywords': {token:'keyword.$0'}, '@default': '' } }], // whitespace @@ -100,7 +100,7 @@ export var language = { [/\$[\w]+/, { cases: { '$S2=="': 'variable', '@default': 'string' }}], [/["']/, { cases: { '$#==$S2' : { token: 'string', next: '@pop' }, - '@default': { cases: { '@eos': {token:'string', next:'@popall'}, '@default': 'string' }} }} ], + '@default': { cases: { '@eos': {token:'string', next:'@popall'}, '@default': 'string' }} }} ], ], herestring: [ @@ -111,7 +111,7 @@ export var language = { [/\$[\w]+/, { cases: { '$S2=="': 'variable', '@default': 'string' } }], ], - comment: [ + comment: [ [/[^#\.]+/, 'comment' ], [/#>/, 'comment', '@pop'], [/(\.)(@helpKeywords)(?!\w)/, { token: 'comment.keyword.$2' } ], diff --git a/src/vs/editor/standalone-languages/python.ts b/src/vs/editor/standalone-languages/python.ts index 61d310bd3d1..9da3cd81c99 100644 --- a/src/vs/editor/standalone-languages/python.ts +++ b/src/vs/editor/standalone-languages/python.ts @@ -169,7 +169,7 @@ export var language = { [/@[a-zA-Z]\w*/, 'tag'], [/[a-zA-Z]\w*/, { cases: { '@keywords': 'keyword', - '@default': 'identifier' } }] + '@default': 'identifier' } }] ], // Deal with white space, including single and multi-line comments diff --git a/src/vs/editor/standalone-languages/ruby.ts b/src/vs/editor/standalone-languages/ruby.ts index eb5f235de73..7ad7eaa2961 100644 --- a/src/vs/editor/standalone-languages/ruby.ts +++ b/src/vs/editor/standalone-languages/ruby.ts @@ -8,376 +8,376 @@ import {ILanguage} from './types'; /* -Ruby language definition - -Quite a complex language due to elaborate escape sequences -and quoting of literate strings/regular expressions, and -an 'end' keyword that does not always apply to modifiers like until and while, -and a 'do' keyword that sometimes starts a block, but sometimes is part of -another statement (like 'while'). - -(1) end blocks: -'end' may end declarations like if or until, but sometimes 'if' or 'until' -are modifiers where there is no 'end'. Also, 'do' sometimes starts a block -that is ended by 'end', but sometimes it is part of a 'while', 'for', or 'until' -To do proper brace matching we do some elaborate state manipulation. -some examples: - - until bla do - work until tired - list.each do - something if test - end - end - -or - -if test - something (if test then x end) - bar if bla -end - -or, how about using class as a property.. - -class Test - def endpoint - self.class.endpoint || routes - end -end - -(2) quoting: -there are many kinds of strings and escape sequences. But also, one can -start many string-like things as '%qx' where q specifies the kind of string -(like a command, escape expanded, regular expression, symbol etc.), and x is -some character and only another 'x' ends the sequence. Except for brackets -where the closing bracket ends the sequence.. and except for a nested bracket -inside the string like entity. Also, such strings can contain interpolated -ruby expressions again (and span multiple lines). Moreover, expanded -regular expression can also contain comments. -*/ + * Ruby language definition + * + * Quite a complex language due to elaborate escape sequences + * and quoting of literate strings/regular expressions, and + * an 'end' keyword that does not always apply to modifiers like until and while, + * and a 'do' keyword that sometimes starts a block, but sometimes is part of + * another statement (like 'while'). + * + * (1) end blocks: + * 'end' may end declarations like if or until, but sometimes 'if' or 'until' + * are modifiers where there is no 'end'. Also, 'do' sometimes starts a block + * that is ended by 'end', but sometimes it is part of a 'while', 'for', or 'until' + * To do proper brace matching we do some elaborate state manipulation. + * some examples: + * + * until bla do + * work until tired + * list.each do + * something if test + * end + * end + * + * or + * + * if test + * something (if test then x end) + * bar if bla + * end + * + * or, how about using class as a property.. + * + * class Test + * def endpoint + * self.class.endpoint || routes + * end + * end + * + * (2) quoting: + * there are many kinds of strings and escape sequences. But also, one can + * start many string-like things as '%qx' where q specifies the kind of string + * (like a command, escape expanded, regular expression, symbol etc.), and x is + * some character and only another 'x' ends the sequence. Except for brackets + * where the closing bracket ends the sequence.. and except for a nested bracket + * inside the string like entity. Also, such strings can contain interpolated + * ruby expressions again (and span multiple lines). Moreover, expanded + * regular expression can also contain comments. + */ export var language = { - displayName: '', - name: 'ruby', + displayName: '', + name: 'ruby', - lineComment: '#', - blockCommentStart: '=begin', - blockCommentEnd: '=end', + lineComment: '#', + blockCommentStart: '=begin', + blockCommentEnd: '=end', - keywords: [ - '__LINE__', '__ENCODING__', '__FILE__', 'BEGIN', 'END', 'alias', 'and', 'begin', - 'break', 'case', 'class', 'def', 'defined?', 'do', 'else', 'elsif', 'end', - 'ensure', 'for', 'false', 'if', 'in', 'module', 'next', 'nil', 'not', 'or', 'redo', - 'rescue', 'retry', 'return', 'self', 'super', 'then', 'true', 'undef', 'unless', - 'until', 'when', 'while', 'yield', - ], + keywords: [ + '__LINE__', '__ENCODING__', '__FILE__', 'BEGIN', 'END', 'alias', 'and', 'begin', + 'break', 'case', 'class', 'def', 'defined?', 'do', 'else', 'elsif', 'end', + 'ensure', 'for', 'false', 'if', 'in', 'module', 'next', 'nil', 'not', 'or', 'redo', + 'rescue', 'retry', 'return', 'self', 'super', 'then', 'true', 'undef', 'unless', + 'until', 'when', 'while', 'yield', + ], - keywordops: [ - '::', '..', '...', '?', ':', '=>' - ], + keywordops: [ + '::', '..', '...', '?', ':', '=>' + ], - builtins: [ - 'require', 'public', 'private', 'include', 'extend', 'attr_reader', - 'protected', 'private_class_method', 'protected_class_method', 'new' - ], + builtins: [ + 'require', 'public', 'private', 'include', 'extend', 'attr_reader', + 'protected', 'private_class_method', 'protected_class_method', 'new' + ], - // these are closed by 'end' (if, while and until are handled separately) - declarations: [ - 'module','class','def','case','do','begin','for','if','while','until','unless' - ], + // these are closed by 'end' (if, while and until are handled separately) + declarations: [ + 'module','class','def','case','do','begin','for','if','while','until','unless' + ], - linedecls: [ - 'def','case','do','begin','for','if','while','until','unless' - ], + linedecls: [ + 'def','case','do','begin','for','if','while','until','unless' + ], - operators: [ - '^', '&', '|', '<=>', '==', '===', '!~', '=~', '>', '>=', '<', '<=', '<<', '>>', '+', - '-', '*', '/', '%', '**', '~', '+@', '-@', '[]', '[]=', '`', - '+=', '-=', '*=', '**=', '/=', '^=', '%=', '<<=', '>>=', '&=', '&&=', '||=', '|=' - ], + operators: [ + '^', '&', '|', '<=>', '==', '===', '!~', '=~', '>', '>=', '<', '<=', '<<', '>>', '+', + '-', '*', '/', '%', '**', '~', '+@', '-@', '[]', '[]=', '`', + '+=', '-=', '*=', '**=', '/=', '^=', '%=', '<<=', '>>=', '&=', '&&=', '||=', '|=' + ], - brackets: [ - { open: '(', close: ')', token: 'delimiter.parenthesis'}, - { open: '{', close: '}', token: 'delimiter.curly'}, - { open: '[', close: ']', token: 'delimiter.square'} - ], + brackets: [ + { open: '(', close: ')', token: 'delimiter.parenthesis'}, + { open: '{', close: '}', token: 'delimiter.curly'}, + { open: '[', close: ']', token: 'delimiter.square'} + ], - // trigger outdenting on 'end' - outdentTriggers: 'd', + // trigger outdenting on 'end' + outdentTriggers: 'd', - // we include these common regular expressions - symbols: /[=> where decl is the current opening declaration (like 'class') - root: [ - // identifiers and keywords - // most complexity here is due to matching 'end' correctly with declarations. - // We distinguish a declaration that comes first on a line, versus declarations further on a line (which are most likey modifiers) - [/^(\s*)([a-z_]\w*[!?=]?)/, ['white', - { cases: { 'for|until|while': { token: 'keyword.$2', bracket: '@open', next: '@dodecl.$2' }, - '@declarations': { token: 'keyword.$2', bracket: '@open', next: '@root.$2' }, - 'end': { token: 'keyword.$S2', bracket: '@close', next: '@pop' }, - '@keywords': 'keyword', - '@builtins': 'predefined', - '@default': 'identifier' } }]], - [/[a-z_]\w*[!?=]?/, - { cases: { 'if|unless|while|until': { token: 'keyword.$0x', bracket: '@open', next: '@modifier.$0x' }, - 'for': { token: 'keyword.$2', bracket: '@open', next: '@dodecl.$2' }, - '@linedecls': { token: 'keyword.$0', bracket: '@open', next: '@root.$0' }, - 'end': { token: 'keyword.$S2', bracket: '@close', next: '@pop' }, - '@keywords': 'keyword', - '@builtins': 'predefined', - '@default': 'identifier' } }], + // The main tokenizer for our languages + tokenizer: { + // Main entry. + // root. where decl is the current opening declaration (like 'class') + root: [ + // identifiers and keywords + // most complexity here is due to matching 'end' correctly with declarations. + // We distinguish a declaration that comes first on a line, versus declarations further on a line (which are most likey modifiers) + [/^(\s*)([a-z_]\w*[!?=]?)/, ['white', + { cases: { 'for|until|while': { token: 'keyword.$2', bracket: '@open', next: '@dodecl.$2' }, + '@declarations': { token: 'keyword.$2', bracket: '@open', next: '@root.$2' }, + 'end': { token: 'keyword.$S2', bracket: '@close', next: '@pop' }, + '@keywords': 'keyword', + '@builtins': 'predefined', + '@default': 'identifier' } }]], + [/[a-z_]\w*[!?=]?/, + { cases: { 'if|unless|while|until': { token: 'keyword.$0x', bracket: '@open', next: '@modifier.$0x' }, + 'for': { token: 'keyword.$2', bracket: '@open', next: '@dodecl.$2' }, + '@linedecls': { token: 'keyword.$0', bracket: '@open', next: '@root.$0' }, + 'end': { token: 'keyword.$S2', bracket: '@close', next: '@pop' }, + '@keywords': 'keyword', + '@builtins': 'predefined', + '@default': 'identifier' } }], - [/[A-Z][\w]*[!?=]?/, 'constructor.identifier' ], // constant - [/\$[\w]*/, 'global.constant' ], // global - [/@[\w]*/, 'namespace.instance.identifier' ], // instance - [/@@[\w]*/, 'namespace.class.identifier' ], // class + [/[A-Z][\w]*[!?=]?/, 'constructor.identifier' ], // constant + [/\$[\w]*/, 'global.constant' ], // global + [/@[\w]*/, 'namespace.instance.identifier' ], // instance + [/@@[\w]*/, 'namespace.class.identifier' ], // class - // here document - [/<<-(@heredelim).*/, { token: 'string.heredoc.delimiter', bracket: '@open', next: '@heredoc.$1' } ], - [/[ \t\r\n]+<<(@heredelim).*/, { token: 'string.heredoc.delimiter', bracket: '@open', next: '@heredoc.$1' } ], - [/^<<(@heredelim).*/, { token: 'string.heredoc.delimiter', bracket: '@open', next: '@heredoc.$1' } ], + // here document + [/<<-(@heredelim).*/, { token: 'string.heredoc.delimiter', bracket: '@open', next: '@heredoc.$1' } ], + [/[ \t\r\n]+<<(@heredelim).*/, { token: 'string.heredoc.delimiter', bracket: '@open', next: '@heredoc.$1' } ], + [/^<<(@heredelim).*/, { token: 'string.heredoc.delimiter', bracket: '@open', next: '@heredoc.$1' } ], - // whitespace - { include: '@whitespace' }, + // whitespace + { include: '@whitespace' }, - // strings - [/"/, { token: 'string.d.delim', bracket: '@open', next: '@dstring.d."'} ], - [/'/, { token: 'string.sq.delim', bracket: '@open', next: '@sstring.sq' } ], + // strings + [/"/, { token: 'string.d.delim', bracket: '@open', next: '@dstring.d."'} ], + [/'/, { token: 'string.sq.delim', bracket: '@open', next: '@sstring.sq' } ], - // % literals. For efficiency, rematch in the 'pstring' state - [/%([rsqxwW]|Q?)/, { token: '@rematch', next: 'pstring' } ], + // % literals. For efficiency, rematch in the 'pstring' state + [/%([rsqxwW]|Q?)/, { token: '@rematch', next: 'pstring' } ], - // commands and symbols - [/`/, { token: 'string.x.delim', bracket: '@open', next: '@dstring.x.`' } ], - [/:(\w|[$@])\w*[!?=]?/, 'string.s'], - [/:"/, { token: 'string.s.delim', bracket: '@open', next: '@dstring.s."' } ], - [/:'/, { token: 'string.s.delim', bracket: '@open', next: '@sstring.s' } ], + // commands and symbols + [/`/, { token: 'string.x.delim', bracket: '@open', next: '@dstring.x.`' } ], + [/:(\w|[$@])\w*[!?=]?/, 'string.s'], + [/:"/, { token: 'string.s.delim', bracket: '@open', next: '@dstring.s."' } ], + [/:'/, { token: 'string.s.delim', bracket: '@open', next: '@sstring.s' } ], - // regular expressions. Lookahead for a (not escaped) closing forwardslash on the same line - [/\/(?=(\\\/|[^\/\n])+\/)/, { token: 'regexp.delim', bracket: '@open', next: '@regexp' } ], + // regular expressions. Lookahead for a (not escaped) closing forwardslash on the same line + [/\/(?=(\\\/|[^\/\n])+\/)/, { token: 'regexp.delim', bracket: '@open', next: '@regexp' } ], - // delimiters and operators - [/[{}()\[\]]/, '@brackets'], - [/@symbols/, { cases: { '@keywordops': 'keyword', - '@operators' : 'operator', - '@default' : '' } } ], + // delimiters and operators + [/[{}()\[\]]/, '@brackets'], + [/@symbols/, { cases: { '@keywordops': 'keyword', + '@operators' : 'operator', + '@default' : '' } } ], - [/[;,]/, 'delimiter'], + [/[;,]/, 'delimiter'], - // numbers - [/0[xX][0-9a-fA-F](_?[0-9a-fA-F])*/, 'number.hex'], - [/0[_oO][0-7](_?[0-7])*/, 'number.octal'], - [/0[bB][01](_?[01])*/, 'number.binary'], - [/0[dD]@decpart/, 'number'], - [/@decimal((\.@decpart)?([eE][\-+]?@decpart)?)/, { cases: { '$1': 'number.float', - '@default': 'number' }}], + // numbers + [/0[xX][0-9a-fA-F](_?[0-9a-fA-F])*/, 'number.hex'], + [/0[_oO][0-7](_?[0-7])*/, 'number.octal'], + [/0[bB][01](_?[01])*/, 'number.binary'], + [/0[dD]@decpart/, 'number'], + [/@decimal((\.@decpart)?([eE][\-+]?@decpart)?)/, { cases: { '$1': 'number.float', + '@default': 'number' }}], - ], + ], - // used to not treat a 'do' as a block opener if it occurs on the same - // line as a 'do' statement: 'while|until|for' - // dodecl. where decl is the declarations started, like 'while' - dodecl: [ - [/^/, { token: '', switchTo: '@root.$S2' }], // get out of do-skipping mode on a new line - [/[a-z_]\w*[!?=]?/, { cases: { 'end': { token: 'keyword.$S2', bracket: '@close', next: '@pop' }, // end on same line - 'do' : { token: 'keyword', switchTo: '@root.$S2' }, // do on same line: not an open bracket here - '@linedecls': { token: '@rematch', switchTo: '@root.$S2' }, // other declaration on same line: rematch - '@keywords': 'keyword', - '@builtins': 'predefined', - '@default': 'identifier' } }], - { include: '@root' } - ], + // used to not treat a 'do' as a block opener if it occurs on the same + // line as a 'do' statement: 'while|until|for' + // dodecl. where decl is the declarations started, like 'while' + dodecl: [ + [/^/, { token: '', switchTo: '@root.$S2' }], // get out of do-skipping mode on a new line + [/[a-z_]\w*[!?=]?/, { cases: { 'end': { token: 'keyword.$S2', bracket: '@close', next: '@pop' }, // end on same line + 'do' : { token: 'keyword', switchTo: '@root.$S2' }, // do on same line: not an open bracket here + '@linedecls': { token: '@rematch', switchTo: '@root.$S2' }, // other declaration on same line: rematch + '@keywords': 'keyword', + '@builtins': 'predefined', + '@default': 'identifier' } }], + { include: '@root' } + ], - // used to prevent potential modifiers ('if|until|while|unless') to match - // with 'end' keywords. - // modifier.x where decl is the declaration starter, like 'if' - modifier: [ - [/^/, '', '@pop'], // it was a modifier: get out of modifier mode on a new line - [/[a-z_]\w*[!?=]?/, { cases: { 'end': { token: 'keyword.$S2', bracket: '@close', next: '@pop' }, // end on same line - 'then|else|elsif|do': { token: 'keyword', switchTo: '@root.$S2' }, // real declaration and not a modifier - '@linedecls': { token: '@rematch', switchTo: '@root.$S2' }, // other declaration => not a modifier - '@keywords': 'keyword', - '@builtins': 'predefined', - '@default': 'identifier' } }], - { include: '@root' } - ], + // used to prevent potential modifiers ('if|until|while|unless') to match + // with 'end' keywords. + // modifier.x where decl is the declaration starter, like 'if' + modifier: [ + [/^/, '', '@pop'], // it was a modifier: get out of modifier mode on a new line + [/[a-z_]\w*[!?=]?/, { cases: { 'end': { token: 'keyword.$S2', bracket: '@close', next: '@pop' }, // end on same line + 'then|else|elsif|do': { token: 'keyword', switchTo: '@root.$S2' }, // real declaration and not a modifier + '@linedecls': { token: '@rematch', switchTo: '@root.$S2' }, // other declaration => not a modifier + '@keywords': 'keyword', + '@builtins': 'predefined', + '@default': 'identifier' } }], + { include: '@root' } + ], - // single quote strings (also used for symbols) - // sstring. where kind is 'sq' (single quote) or 's' (symbol) - sstring: [ - [/[^\\']+/, 'string.$S2' ], - [/\\\\|\\'|\\$/, 'string.$S2.escape'], - [/\\./, 'string.$S2.invalid'], - [/'/, { token: 'string.$S2.delim', bracket: '@close', next: '@pop'} ] - ], + // single quote strings (also used for symbols) + // sstring. where kind is 'sq' (single quote) or 's' (symbol) + sstring: [ + [/[^\\']+/, 'string.$S2' ], + [/\\\\|\\'|\\$/, 'string.$S2.escape'], + [/\\./, 'string.$S2.invalid'], + [/'/, { token: 'string.$S2.delim', bracket: '@close', next: '@pop'} ] + ], - // double quoted "string". - // dstring.. where kind is 'd' (double quoted), 'x' (command), or 's' (symbol) - // and delim is the ending delimiter (" or `) - dstring: [ - [/[^\\`"#]+/, 'string.$S2'], - [/#/, 'string.$S2.escape', '@interpolated' ], - [/\\$/, 'string.$S2.escape' ], - [/@escapes/, 'string.$S2.escape'], - [/\\./, 'string.$S2.escape.invalid'], - [/[`"]/, { cases: { '$#==$S3': { token: 'string.$S2.delim', bracket: '@close', next: '@pop'}, - '@default': 'string.$S2' } } ] - ], + // double quoted "string". + // dstring.. where kind is 'd' (double quoted), 'x' (command), or 's' (symbol) + // and delim is the ending delimiter (" or `) + dstring: [ + [/[^\\`"#]+/, 'string.$S2'], + [/#/, 'string.$S2.escape', '@interpolated' ], + [/\\$/, 'string.$S2.escape' ], + [/@escapes/, 'string.$S2.escape'], + [/\\./, 'string.$S2.escape.invalid'], + [/[`"]/, { cases: { '$#==$S3': { token: 'string.$S2.delim', bracket: '@close', next: '@pop'}, + '@default': 'string.$S2' } } ] + ], - // literal documents - // heredoc. where close is the closing delimiter - heredoc: [ - [/^(\s*)(@heredelim)$/, { cases: { '$2==$S2': ['string.heredoc', { token: 'string.heredoc.delimiter', bracket: '@close', next: '@pop' }], - '@default': ['string.heredoc','string.heredoc'] }}], - [/.*/, 'string.heredoc' ], - ], + // literal documents + // heredoc. where close is the closing delimiter + heredoc: [ + [/^(\s*)(@heredelim)$/, { cases: { '$2==$S2': ['string.heredoc', { token: 'string.heredoc.delimiter', bracket: '@close', next: '@pop' }], + '@default': ['string.heredoc','string.heredoc'] }}], + [/.*/, 'string.heredoc' ], + ], - // interpolated sequence - interpolated: [ - [/\$\w*/, 'global.constant', '@pop' ], - [/@\w*/, 'namespace.class.identifier', '@pop' ], - [/@@\w*/, 'namespace.instance.identifier', '@pop' ], - [/[{]/, { token: 'string.escape.curly', bracket: '@open', switchTo: '@interpolated_compound' }], - ['', '', '@pop' ], // just a # is interpreted as a # - ], + // interpolated sequence + interpolated: [ + [/\$\w*/, 'global.constant', '@pop' ], + [/@\w*/, 'namespace.class.identifier', '@pop' ], + [/@@\w*/, 'namespace.instance.identifier', '@pop' ], + [/[{]/, { token: 'string.escape.curly', bracket: '@open', switchTo: '@interpolated_compound' }], + ['', '', '@pop' ], // just a # is interpreted as a # + ], - // any code - interpolated_compound: [ - [/[}]/, { token: 'string.escape.curly', bracket: '@close', next: '@pop'} ], - { include: '@root' }, - ], + // any code + interpolated_compound: [ + [/[}]/, { token: 'string.escape.curly', bracket: '@close', next: '@pop'} ], + { include: '@root' }, + ], - // %r quoted regexp - // pregexp.. where open/close are the open/close delimiter - pregexp: [ - { include: '@whitespace' }, - // turns out that you can quote using regex control characters, aargh! - // for example; %r|kgjgaj| is ok (even though | is used for alternation) - // so, we need to match those first - [/[^\(\{\[\\]/, { cases: { '$#==$S3' : { token: 'regexp.delim', bracket: '@close', next: '@pop' }, - '$#==$S2' : { token: 'regexp.delim', bracket: '@open', next: '@push' }, // nested delimiters are allowed.. - '~[)}\\]]' : '@brackets.regexp.escape.control', - '~@regexpctl': 'regexp.escape.control', - '@default': 'regexp' }}], - { include: '@regexcontrol' }, - ], + // %r quoted regexp + // pregexp.. where open/close are the open/close delimiter + pregexp: [ + { include: '@whitespace' }, + // turns out that you can quote using regex control characters, aargh! + // for example; %r|kgjgaj| is ok (even though | is used for alternation) + // so, we need to match those first + [/[^\(\{\[\\]/, { cases: { '$#==$S3' : { token: 'regexp.delim', bracket: '@close', next: '@pop' }, + '$#==$S2' : { token: 'regexp.delim', bracket: '@open', next: '@push' }, // nested delimiters are allowed.. + '~[)}\\]]' : '@brackets.regexp.escape.control', + '~@regexpctl': 'regexp.escape.control', + '@default': 'regexp' }}], + { include: '@regexcontrol' }, + ], - // We match regular expression quite precisely - regexp: [ - { include: '@regexcontrol' }, - [/[^\\\/]/, 'regexp' ], - ['/[ixmp]*', { token: 'regexp.delim', bracket: '@close'}, '@pop' ], - ], + // We match regular expression quite precisely + regexp: [ + { include: '@regexcontrol' }, + [/[^\\\/]/, 'regexp' ], + ['/[ixmp]*', { token: 'regexp.delim', bracket: '@close'}, '@pop' ], + ], - regexcontrol: [ - [/(\{)(\d+(?:,\d*)?)(\})/, ['@brackets.regexp.escape.control', 'regexp.escape.control', '@brackets.regexp.escape.control'] ], - [/(\[)(\^?)/, ['@brackets.regexp.escape.control',{ token: 'regexp.escape.control', next: '@regexrange'}]], - [/(\()(\?[:=!])/, ['@brackets.regexp.escape.control', 'regexp.escape.control'] ], - [/\(\?#/, { token: 'regexp.escape.control', bracket: '@open', next: '@regexpcomment' }], - [/[()]/, '@brackets.regexp.escape.control'], - [/@regexpctl/, 'regexp.escape.control'], - [/\\$/, 'regexp.escape' ], - [/@regexpesc/, 'regexp.escape' ], - [/\\\./, 'regexp.invalid' ], - [/#/, 'regexp.escape', '@interpolated' ], - ], + regexcontrol: [ + [/(\{)(\d+(?:,\d*)?)(\})/, ['@brackets.regexp.escape.control', 'regexp.escape.control', '@brackets.regexp.escape.control'] ], + [/(\[)(\^?)/, ['@brackets.regexp.escape.control',{ token: 'regexp.escape.control', next: '@regexrange'}]], + [/(\()(\?[:=!])/, ['@brackets.regexp.escape.control', 'regexp.escape.control'] ], + [/\(\?#/, { token: 'regexp.escape.control', bracket: '@open', next: '@regexpcomment' }], + [/[()]/, '@brackets.regexp.escape.control'], + [/@regexpctl/, 'regexp.escape.control'], + [/\\$/, 'regexp.escape' ], + [/@regexpesc/, 'regexp.escape' ], + [/\\\./, 'regexp.invalid' ], + [/#/, 'regexp.escape', '@interpolated' ], + ], - regexrange: [ - [/-/, 'regexp.escape.control'], - [/\^/, 'regexp.invalid'], - [/\\$/, 'regexp.escape' ], - [/@regexpesc/, 'regexp.escape'], - [/[^\]]/, 'regexp'], - [/\]/, '@brackets.regexp.escape.control', '@pop'], - ], + regexrange: [ + [/-/, 'regexp.escape.control'], + [/\^/, 'regexp.invalid'], + [/\\$/, 'regexp.escape' ], + [/@regexpesc/, 'regexp.escape'], + [/[^\]]/, 'regexp'], + [/\]/, '@brackets.regexp.escape.control', '@pop'], + ], - regexpcomment: [ - [ /[^)]+/, 'comment' ], - [ /\)/, { token: 'regexp.escape.control', bracket: '@close', next: '@pop' } ] - ], + regexpcomment: [ + [ /[^)]+/, 'comment' ], + [ /\)/, { token: 'regexp.escape.control', bracket: '@close', next: '@pop' } ] + ], - // % quoted strings - // A bit repetitive since we need to often special case the kind of ending delimiter - pstring: [ - [/%([qws])\(/, { token: 'string.$1.delim', bracket: '@open', switchTo: '@qstring.$1.(.)' } ], - [/%([qws])\[/, { token: 'string.$1.delim', bracket: '@open', switchTo: '@qstring.$1.[.]' } ], - [/%([qws])\{/, { token: 'string.$1.delim', bracket: '@open', switchTo: '@qstring.$1.{.}' } ], - [/%([qws])' } ], - [/%([qws])(@delim)/, { token: 'string.$1.delim', bracket: '@open', switchTo: '@qstring.$1.$2.$2' } ], + // % quoted strings + // A bit repetitive since we need to often special case the kind of ending delimiter + pstring: [ + [/%([qws])\(/, { token: 'string.$1.delim', bracket: '@open', switchTo: '@qstring.$1.(.)' } ], + [/%([qws])\[/, { token: 'string.$1.delim', bracket: '@open', switchTo: '@qstring.$1.[.]' } ], + [/%([qws])\{/, { token: 'string.$1.delim', bracket: '@open', switchTo: '@qstring.$1.{.}' } ], + [/%([qws])' } ], + [/%([qws])(@delim)/, { token: 'string.$1.delim', bracket: '@open', switchTo: '@qstring.$1.$2.$2' } ], - [/%r\(/, { token: 'regexp.delim', bracket: '@open', switchTo: '@pregexp.(.)' } ], - [/%r\[/, { token: 'regexp.delim', bracket: '@open', switchTo: '@pregexp.[.]' } ], - [/%r\{/, { token: 'regexp.delim', bracket: '@open', switchTo: '@pregexp.{.}' } ], - [/%r' } ], - [/%r(@delim)/, { token: 'regexp.delim', bracket: '@open', switchTo: '@pregexp.$1.$1' } ], + [/%r\(/, { token: 'regexp.delim', bracket: '@open', switchTo: '@pregexp.(.)' } ], + [/%r\[/, { token: 'regexp.delim', bracket: '@open', switchTo: '@pregexp.[.]' } ], + [/%r\{/, { token: 'regexp.delim', bracket: '@open', switchTo: '@pregexp.{.}' } ], + [/%r' } ], + [/%r(@delim)/, { token: 'regexp.delim', bracket: '@open', switchTo: '@pregexp.$1.$1' } ], - [/%(x|W|Q?)\(/, { token: 'string.$1.delim', bracket: '@open', switchTo: '@qqstring.$1.(.)' } ], - [/%(x|W|Q?)\[/, { token: 'string.$1.delim', bracket: '@open', switchTo: '@qqstring.$1.[.]' } ], - [/%(x|W|Q?)\{/, { token: 'string.$1.delim', bracket: '@open', switchTo: '@qqstring.$1.{.}' } ], - [/%(x|W|Q?)' } ], - [/%(x|W|Q?)(@delim)/, { token: 'string.$1.delim', bracket: '@open', switchTo: '@qqstring.$1.$2.$2' } ], + [/%(x|W|Q?)\(/, { token: 'string.$1.delim', bracket: '@open', switchTo: '@qqstring.$1.(.)' } ], + [/%(x|W|Q?)\[/, { token: 'string.$1.delim', bracket: '@open', switchTo: '@qqstring.$1.[.]' } ], + [/%(x|W|Q?)\{/, { token: 'string.$1.delim', bracket: '@open', switchTo: '@qqstring.$1.{.}' } ], + [/%(x|W|Q?)' } ], + [/%(x|W|Q?)(@delim)/, { token: 'string.$1.delim', bracket: '@open', switchTo: '@qqstring.$1.$2.$2' } ], - [/%([rqwsxW]|Q?)./, { token: 'invalid', next: '@pop' } ], // recover - [/./, { token: 'invalid', next: '@pop' } ], // recover - ], + [/%([rqwsxW]|Q?)./, { token: 'invalid', next: '@pop' } ], // recover + [/./, { token: 'invalid', next: '@pop' } ], // recover + ], - // non-expanded quoted string. - // qstring... - // kind = q|w|s (single quote, array, symbol) - // open = open delimiter - // close = close delimiter - qstring: [ - [/\\$/, 'string.$S2.escape' ], - [/\\./, 'string.$S2.escape' ], - [/./, { cases: { '$#==$S4' : { token: 'string.$S2.delim', bracket: '@close', next: '@pop' }, - '$#==$S3' : { token: 'string.$S2.delim', bracket: '@open', next: '@push' }, // nested delimiters are allowed.. - '@default': 'string.$S2' }}], - ], + // non-expanded quoted string. + // qstring... + // kind = q|w|s (single quote, array, symbol) + // open = open delimiter + // close = close delimiter + qstring: [ + [/\\$/, 'string.$S2.escape' ], + [/\\./, 'string.$S2.escape' ], + [/./, { cases: { '$#==$S4' : { token: 'string.$S2.delim', bracket: '@close', next: '@pop' }, + '$#==$S3' : { token: 'string.$S2.delim', bracket: '@open', next: '@push' }, // nested delimiters are allowed.. + '@default': 'string.$S2' }}], + ], - // expanded quoted string. - // qqstring... - // kind = Q|W|x (double quote, array, command) - // open = open delimiter - // close = close delimiter - qqstring: [ - [/#/, 'string.$S2.escape', '@interpolated' ], - { include: '@qstring' } - ], + // expanded quoted string. + // qqstring... + // kind = Q|W|x (double quote, array, command) + // open = open delimiter + // close = close delimiter + qqstring: [ + [/#/, 'string.$S2.escape', '@interpolated' ], + { include: '@qstring' } + ], - // whitespace & comments - whitespace: [ - [/[ \t\r\n]+/, ''], - [/^\s*=begin\b/, 'comment', '@comment' ], - [/#.*$/, 'comment'], - ], + // whitespace & comments + whitespace: [ + [/[ \t\r\n]+/, ''], + [/^\s*=begin\b/, 'comment', '@comment' ], + [/#.*$/, 'comment'], + ], - comment: [ - [/[^=]+/, 'comment' ], - [/^\s*=begin\b/, 'comment.invalid' ], // nested comment - [/^\s*=end\b.*/, 'comment', '@pop' ], - [/[=]/, 'comment' ] - ], - } + comment: [ + [/[^=]+/, 'comment' ], + [/^\s*=begin\b/, 'comment.invalid' ], // nested comment + [/^\s*=end\b.*/, 'comment', '@pop' ], + [/[=]/, 'comment' ] + ], + } }; \ No newline at end of file diff --git a/src/vs/languages/css/common/parser/cssParser.ts b/src/vs/languages/css/common/parser/cssParser.ts index f9bbfd1256b..b7be152acee 100644 --- a/src/vs/languages/css/common/parser/cssParser.ts +++ b/src/vs/languages/css/common/parser/cssParser.ts @@ -539,7 +539,7 @@ export class Parser { // media_query : [ONLY | NOT]? S* IDENT S* [ AND S* expression ]* | expression [ AND S* expression ]* // expression : '(' S* IDENT S* [ ':' S* expr ]? ')' S* - var node = this.create(nodes.MediaQuery); + var node = this.create(nodes.MediaQuery); var parseExpression= true; var hasContent = false; diff --git a/src/vs/languages/css/test/common/css-worker.test.ts b/src/vs/languages/css/test/common/css-worker.test.ts index f1c93cf6b15..7008b440d9f 100644 --- a/src/vs/languages/css/test/common/css-worker.test.ts +++ b/src/vs/languages/css/test/common/css-worker.test.ts @@ -69,7 +69,7 @@ suite('Validation - CSS', () => { return { worker: worker, model: model, markers: markers }; }; - var testSuggestionsFor = function(value:string, stringBefore:string):WinJS.TPromise { + var testSuggestionsFor = function(value:string, stringBefore:string):WinJS.TPromise { var url = new Network.URL('test://1'); var env = mockCSSWorkerEnv(url, value); @@ -78,7 +78,7 @@ suite('Validation - CSS', () => { return env.worker.suggest(url, position).then(result => result[0]); }; - var testValueSetFor = function(value:string, selection:string, selectionLength: number, up: boolean):WinJS.TPromise { + var testValueSetFor = function(value:string, selection:string, selectionLength: number, up: boolean):WinJS.TPromise { var url = new Network.URL('test://1'); var env = mockCSSWorkerEnv(url, value); @@ -114,7 +114,7 @@ suite('Validation - CSS', () => { return suggestion.label === label && (!type || suggestion.type === type); }); if (proposalsFound.length != 1) { - assert.fail("Suggestion not found: " + label + ", has " + completion.suggestions.map(s => s.label).join(', ')); + assert.fail("Suggestion not found: " + label + ", has " + completion.suggestions.map(s => s.label).join(', ')); } }; diff --git a/src/vs/languages/html/common/htmlTags.ts b/src/vs/languages/html/common/htmlTags.ts index 0df9865e12f..9d786e47c1d 100644 --- a/src/vs/languages/html/common/htmlTags.ts +++ b/src/vs/languages/html/common/htmlTags.ts @@ -102,7 +102,7 @@ export function getHTML5TagProvider(): IHTMLTagProvider { style: ['media', 'type', 'scoped:v'], script: ['src', 'async:v', 'defer:v', 'type', 'charset'], body: ['onafterprint', 'onbeforeprint', 'onbeforeunload', 'onblur', 'onerror', 'onfocus', 'onhashchange', 'onload', 'onmessage', - 'onoffline', 'ononline', 'onpagehide', 'onpageshow', 'onpopstate', 'onresize', 'onscroll', 'onstorage', 'onunload'], + 'onoffline', 'ononline', 'onpagehide', 'onpageshow', 'onpopstate', 'onresize', 'onscroll', 'onstorage', 'onunload'], table: none, caption: none, colgroup: ['span'], diff --git a/src/vs/languages/html/test/common/html-worker.test.ts b/src/vs/languages/html/test/common/html-worker.test.ts index e70abffcc44..96a5ac83622 100644 --- a/src/vs/languages/html/test/common/html-worker.test.ts +++ b/src/vs/languages/html/test/common/html-worker.test.ts @@ -50,7 +50,7 @@ suite('HTML - worker', () => { return { worker: worker, model: model, markers: markers }; }; - var testSuggestionsFor = function(value:string):WinJS.TPromise { + var testSuggestionsFor = function(value:string):WinJS.TPromise { var idx = value.indexOf('|'); var content = value.substr(0, idx) + value.substr(idx + 1); @@ -62,13 +62,13 @@ suite('HTML - worker', () => { return env.worker.suggest(url, position).then(result => result[0]); }; - var assertSuggestion = function(completion: Modes.ISuggestions, label: string, type?: string, codeSnippet?: string) { - var proposalsFound = completion.suggestions.filter(function(suggestion: Modes.ISuggestion) { - return suggestion.label === label && (!type || suggestion.type === type) && (!codeSnippet || suggestion.codeSnippet === codeSnippet); - }); - if (proposalsFound.length != 1) { - assert.fail("Suggestion not found: " + label + ", has " + completion.suggestions.map(s => s.label).join(', ')); - } + var assertSuggestion = function(completion: Modes.ISuggestions, label: string, type?: string, codeSnippet?: string) { + var proposalsFound = completion.suggestions.filter(function(suggestion: Modes.ISuggestion) { + return suggestion.label === label && (!type || suggestion.type === type) && (!codeSnippet || suggestion.codeSnippet === codeSnippet); + }); + if (proposalsFound.length != 1) { + assert.fail("Suggestion not found: " + label + ", has " + completion.suggestions.map(s => s.label).join(', ')); + } }; test('Intellisense', function(testDone): any { diff --git a/src/vs/languages/json/common/contributions/bowerJSONContribution.ts b/src/vs/languages/json/common/contributions/bowerJSONContribution.ts index 2e116775a85..38c36f55fb1 100644 --- a/src/vs/languages/json/common/contributions/bowerJSONContribution.ts +++ b/src/vs/languages/json/common/contributions/bowerJSONContribution.ts @@ -44,7 +44,7 @@ export class BowerJSONContribution implements JSONWorker.IJSONWorkerContribution public collectPropertySuggestions(contributionId: string, currentWord: string, addValue: boolean, isLast:boolean, result: JSONWorker.ISuggestionsCollector) : WinJS.Promise { if (contributionId === 'bower-packages') { - if (currentWord.length > 0) { + if (currentWord.length > 0) { var queryUrl = 'https://bower.herokuapp.com/packages/search/' + encodeURIComponent(currentWord); return this.requestService.makeRequest({ @@ -80,7 +80,7 @@ export class BowerJSONContribution implements JSONWorker.IJSONWorkerContribution result.error(nls.localize('json.bower.error.repoaccess', 'Request to the bower repository failed: {0}', error.responseText)); return 0; }); - } else { + } else { this.topRanked.forEach((name) => { var codeSnippet = JSON.stringify(name); if (addValue) { @@ -90,9 +90,9 @@ export class BowerJSONContribution implements JSONWorker.IJSONWorkerContribution } } result.add({ type: 'property', label: name, codeSnippet: codeSnippet, documentationLabel: '' }); - }); - result.setAsIncomplete(); - } + }); + result.setAsIncomplete(); + } } return WinJS.Promise.as(0); } diff --git a/src/vs/languages/json/common/contributions/packageJSONContribution.ts b/src/vs/languages/json/common/contributions/packageJSONContribution.ts index b8d78de7ef1..b2bfce5e24c 100644 --- a/src/vs/languages/json/common/contributions/packageJSONContribution.ts +++ b/src/vs/languages/json/common/contributions/packageJSONContribution.ts @@ -15,11 +15,11 @@ var LIMIT = 40; export class PackageJSONContribution implements JSONWorker.IJSONWorkerContribution { private mostDependedOn = [ 'lodash', 'async', 'underscore', 'request', 'commander', 'express', 'debug', 'chalk', 'colors', 'q', 'coffee-script', - 'mkdirp', 'optimist', 'through2', 'yeoman-generator', 'moment', 'bluebird', 'glob', 'gulp-util', 'minimist', 'cheerio', 'jade', 'redis', 'node-uuid', - 'socket', 'io', 'uglify-js', 'winston', 'through', 'fs-extra', 'handlebars', 'body-parser', 'rimraf', 'mime', 'semver', 'mongodb', 'jquery', - 'grunt', 'connect', 'yosay', 'underscore', 'string', 'xml2js', 'ejs', 'mongoose', 'marked', 'extend', 'mocha', 'superagent', 'js-yaml', 'xtend', - 'shelljs', 'gulp', 'yargs', 'browserify', 'minimatch', 'react', 'less', 'prompt', 'inquirer', 'ws', 'event-stream', 'inherits', 'mysql', 'esprima', - 'jsdom', 'stylus', 'when', 'readable-stream', 'aws-sdk', 'concat-stream', 'chai', 'promise', 'wrench']; + 'mkdirp', 'optimist', 'through2', 'yeoman-generator', 'moment', 'bluebird', 'glob', 'gulp-util', 'minimist', 'cheerio', 'jade', 'redis', 'node-uuid', + 'socket', 'io', 'uglify-js', 'winston', 'through', 'fs-extra', 'handlebars', 'body-parser', 'rimraf', 'mime', 'semver', 'mongodb', 'jquery', + 'grunt', 'connect', 'yosay', 'underscore', 'string', 'xml2js', 'ejs', 'mongoose', 'marked', 'extend', 'mocha', 'superagent', 'js-yaml', 'xtend', + 'shelljs', 'gulp', 'yargs', 'browserify', 'minimatch', 'react', 'less', 'prompt', 'inquirer', 'ws', 'event-stream', 'inherits', 'mysql', 'esprima', + 'jsdom', 'stylus', 'when', 'readable-stream', 'aws-sdk', 'concat-stream', 'chai', 'promise', 'wrench']; private requestService : IRequestService; @@ -45,7 +45,7 @@ export class PackageJSONContribution implements JSONWorker.IJSONWorkerContributi public collectPropertySuggestions(contributionId: string, currentWord: string, addValue: boolean, isLast:boolean, result: JSONWorker.ISuggestionsCollector) : WinJS.Promise { if (contributionId === 'npm-packages') { var queryUrl : string; - if (currentWord.length > 0) { + if (currentWord.length > 0) { queryUrl = 'https://skimdb.npmjs.com/registry/_design/app/_view/browseAll?group_level=1&limit=' + LIMIT + '&start_key=%5B%22' + encodeURIComponent(currentWord) + '%22%5D&end_key=%5B%22'+ encodeURIComponent(currentWord + 'z') + '%22,%7B%7D%5D'; return this.requestService.makeRequest({ @@ -95,9 +95,9 @@ export class PackageJSONContribution implements JSONWorker.IJSONWorkerContributi } } result.add({ type: 'property', label: name, codeSnippet: codeSnippet, documentationLabel: '' }); - }); - result.setAsIncomplete(); - } + }); + result.setAsIncomplete(); + } } return WinJS.Promise.as(0); } diff --git a/src/vs/languages/json/common/contributions/projectJSONContribution.ts b/src/vs/languages/json/common/contributions/projectJSONContribution.ts index 5e2b06b689e..6d1200a5478 100644 --- a/src/vs/languages/json/common/contributions/projectJSONContribution.ts +++ b/src/vs/languages/json/common/contributions/projectJSONContribution.ts @@ -38,7 +38,7 @@ export class ProjectJSONContribution implements JSONWorker.IJSONWorkerContributi public collectPropertySuggestions(contributionId: string, currentWord: string, addValue: boolean, isLast:boolean, result: JSONWorker.ISuggestionsCollector) : WinJS.Promise { if (contributionId === 'nugget-packages') { var queryUrl : string; - if (currentWord.length > 0) { + if (currentWord.length > 0) { queryUrl = 'https://www.nuget.org/api/v2/Packages?' + '$filter=Id%20ge%20\'' + encodeURIComponent(currentWord) diff --git a/src/vs/languages/json/common/jsonSchemaService.ts b/src/vs/languages/json/common/jsonSchemaService.ts index 3fc5c5d6402..6b14c1ae8f6 100644 --- a/src/vs/languages/json/common/jsonSchemaService.ts +++ b/src/vs/languages/json/common/jsonSchemaService.ts @@ -1321,18 +1321,18 @@ export class JSONSchemaService implements IJSONSchemaService { 'type': 'object', 'description': nls.localize('global.json.sdk', 'The runtime to use.'), 'properties': { - 'version': { + 'version': { 'type': 'string', 'description': nls.localize('global.json.sdk.version', 'The runtime version to use.') - }, - 'runtime': { + }, + 'runtime': { 'type': 'string', 'description': nls.localize('global.json.sdk.runtime', 'The runtime to use, e.g. coreclr'), - }, - 'architecture': { + }, + 'architecture': { 'type': 'string', 'description': nls.localize('global.json.sdk.architecture', 'The runtime architecture to use, e.g. x64.') - } + } } } } @@ -1479,11 +1479,11 @@ export class JSONSchemaService implements IJSONSchemaService { 'experimentalDecorators': { 'description': nls.localize('tsconfig.json.compilerOptions.experimentalDecorators', 'Enables experimental support for ES7 decorators.'), 'type': 'boolean' - }, + }, 'experimentalAsyncFunctions': { 'description': nls.localize('tsconfig.json.compilerOptions.experimentalAsynFunctions', 'Enables experimental support for async functions (requires TypeScript 1.6).'), 'type': 'boolean' - } + } } }, 'files': { diff --git a/src/vs/languages/json/test/common/jsonworker.test.ts b/src/vs/languages/json/test/common/jsonworker.test.ts index 934586f1391..945ec46ce0c 100644 --- a/src/vs/languages/json/test/common/jsonworker.test.ts +++ b/src/vs/languages/json/test/common/jsonworker.test.ts @@ -55,7 +55,7 @@ suite('JSON - Worker', () => { } } - var testSuggestionsFor = function(value:string, stringAfter:string, schema?:jsonSchema.IJSONSchema):WinJS.TPromise { + var testSuggestionsFor = function(value:string, stringAfter:string, schema?:jsonSchema.IJSONSchema):WinJS.TPromise { var url = new network.URL('test://test.json'); var env = mockWorkerEnv(url, value); prepareSchemaServer(schema, env.worker); @@ -72,7 +72,7 @@ suite('JSON - Worker', () => { return env.worker.computeInfo(url, position); } - var testValueSetFor = function(value:string, schema:jsonSchema.IJSONSchema, selection:string, selectionLength: number, up: boolean):WinJS.TPromise { + var testValueSetFor = function(value:string, schema:jsonSchema.IJSONSchema, selection:string, selectionLength: number, up: boolean):WinJS.TPromise { var url = new network.URL('test://test.json'); var env = mockWorkerEnv(url, value); prepareSchemaServer(schema, env.worker); diff --git a/src/vs/languages/json/test/node/schema.test.ts b/src/vs/languages/json/test/node/schema.test.ts index b2f8cf50a28..341ce9c9b93 100644 --- a/src/vs/languages/json/test/node/schema.test.ts +++ b/src/vs/languages/json/test/node/schema.test.ts @@ -340,8 +340,8 @@ suite('JSON - schema', () => { var service : SchemaService.IJSONSchemaService = new SchemaService.JSONSchemaService(requestServiceMock); var input = { - "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", + "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", "resources": [ { "name": "SQLServer", @@ -383,8 +383,8 @@ suite('JSON - schema', () => { var service : SchemaService.IJSONSchemaService = new SchemaService.JSONSchemaService(requestServiceMock); var input = { - "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", + "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", "resources": [ { "name": "foo", diff --git a/src/vs/languages/less/common/parser/lessParser.ts b/src/vs/languages/less/common/parser/lessParser.ts index 3b1d63ec0fb..63c0b4d27de 100644 --- a/src/vs/languages/less/common/parser/lessParser.ts +++ b/src/vs/languages/less/common/parser/lessParser.ts @@ -49,7 +49,7 @@ export class LessParser extends cssParser.Parser { } public _parseMediaQuery(resyncStopToken: scanner.TokenType[]): nodes.Node { - var node = super._parseMediaQuery(resyncStopToken); + var node = super._parseMediaQuery(resyncStopToken); if (!node) { var node = this.create(nodes.MediaQuery); if (node.addChild(this._parseVariable())) { diff --git a/src/vs/languages/less/test/common/colorizer.test.ts b/src/vs/languages/less/test/common/colorizer.test.ts index 8d07831cd8a..97d2e60e197 100644 --- a/src/vs/languages/less/test/common/colorizer.test.ts +++ b/src/vs/languages/less/test/common/colorizer.test.ts @@ -26,7 +26,7 @@ suite('LESS-tokenization', () => { }); test('', () => { - modesUtil.executeTests(tokenizationSupport, [ + modesUtil.executeTests(tokenizationSupport, [ // Keywords [{ line: 'isnumber(10);', diff --git a/src/vs/languages/less/test/common/intellisense.test.ts b/src/vs/languages/less/test/common/intellisense.test.ts index 1105bb8e77a..0328d4e3481 100644 --- a/src/vs/languages/less/test/common/intellisense.test.ts +++ b/src/vs/languages/less/test/common/intellisense.test.ts @@ -48,7 +48,7 @@ suite('LESS - Intellisense', () => { return suggestion.label === label; }); if (proposalsFound.length != 1) { - assert.fail("Suggestion not found: " + label + ", has " + completion.suggestions.map(s => s.label).join(', ')); + assert.fail("Suggestion not found: " + label + ", has " + completion.suggestions.map(s => s.label).join(', ')); } }; diff --git a/src/vs/languages/markdown/common/markdown.css b/src/vs/languages/markdown/common/markdown.css index 31a65fb5fdd..2007607704f 100644 --- a/src/vs/languages/markdown/common/markdown.css +++ b/src/vs/languages/markdown/common/markdown.css @@ -150,6 +150,6 @@ code > div { } .hc-black blockquote { - background: transparent; - border-color: #fff; + background: transparent; + border-color: #fff; } \ No newline at end of file diff --git a/src/vs/languages/markdown/test/common/markdown.test.ts b/src/vs/languages/markdown/test/common/markdown.test.ts index 0e8d40041bd..8590b5ba4e3 100644 --- a/src/vs/languages/markdown/test/common/markdown.test.ts +++ b/src/vs/languages/markdown/test/common/markdown.test.ts @@ -22,7 +22,7 @@ suite('Markdown - tokenization', () => { }); test('', () => { - modesUtil.executeTests(tokenizationSupport, [ + modesUtil.executeTests(tokenizationSupport, [ // HTML and embedded content - bug 16912 [{ line: 'foo*bar*', diff --git a/src/vs/languages/php/test/common/php.test.ts b/src/vs/languages/php/test/common/php.test.ts index 14b54263b1a..2a78b5a1bd4 100644 --- a/src/vs/languages/php/test/common/php.test.ts +++ b/src/vs/languages/php/test/common/php.test.ts @@ -32,7 +32,7 @@ suite('Syntax Highlighting - PHP', () => { }); test('', () => { - modesUtil.executeTests(tokenizationSupport, [ + modesUtil.executeTests(tokenizationSupport, [ // Bug 13596:[ErrorTelemetry] Stream did not advance while tokenizing. Mode id is php (stuck) // We're testing the fact that tokenize does not throw @@ -1916,7 +1916,7 @@ suite('Syntax Highlighting - PHP', () => { { startIndex:17, type: '' }, { startIndex:18, type: 'metatag.php', bracket: Modes.Bracket.Close } ]}] - ]); + ]); }); test('Word definition', function() { diff --git a/src/vs/languages/plaintext/test/common/plainText.test.ts b/src/vs/languages/plaintext/test/common/plainText.test.ts index c2de21d5a3b..85c4b7f96ad 100644 --- a/src/vs/languages/plaintext/test/common/plainText.test.ts +++ b/src/vs/languages/plaintext/test/common/plainText.test.ts @@ -21,7 +21,7 @@ suite('Syntax Highlighting - Plain Text', () => { }); test('', () => { - modesUtil.executeTests(tokenizationSupport, [ + modesUtil.executeTests(tokenizationSupport, [ // One line text file [{ line: 'a simple text file', diff --git a/src/vs/languages/razor/test/common/razor.test.ts b/src/vs/languages/razor/test/common/razor.test.ts index 99ab0238448..7c0b63467cf 100644 --- a/src/vs/languages/razor/test/common/razor.test.ts +++ b/src/vs/languages/razor/test/common/razor.test.ts @@ -23,7 +23,7 @@ suite('Syntax Highlighting - Razor', () => { }); test('', () => { - modesUtil.executeTests(tokenizationSupport,[ + modesUtil.executeTests(tokenizationSupport,[ // Embedding - embedded html [{ line: '@{ var x; x }', diff --git a/src/vs/languages/sass/common/sass.ts b/src/vs/languages/sass/common/sass.ts index 00ac6cb9cae..1a23c29aca4 100644 --- a/src/vs/languages/sass/common/sass.ts +++ b/src/vs/languages/sass/common/sass.ts @@ -75,7 +75,7 @@ export var language = { ['[@](extend)', { token: 'keyword.control.at-rule', next: '@extendbody'}], // sass: extend other selectors ['[@](return)', { token: 'keyword.control.at-rule', next: '@declarationbody'}], ['}', { token: 'punctuation.curly', bracket: '@close', next: '@pop'}], - ], + ], selectorname: [ ['#{', { token: 'support.function.interpolation', bracket: '@open', next: '@variableinterpolation' }], // sass: interpolation @@ -125,7 +125,7 @@ export var language = { ], variabledeclaration: [ // sass variables - ['\\$@identifier@ws:', 'variable.decl', '@declarationbody'], + ['\\$@identifier@ws:', 'variable.decl', '@declarationbody'], ], urldeclaration: [ @@ -153,9 +153,9 @@ export var language = { ], variablereference: [ // sass variable reference - ['\\$@identifier', 'variable.ref'], - ['\\.\\.\\.', 'keyword.operator'], // var args in reference - ['#{', { token: 'support.function.interpolation', bracket: '@open', next: '@variableinterpolation' }], // sass var resolve + ['\\$@identifier', 'variable.ref'], + ['\\.\\.\\.', 'keyword.operator'], // var args in reference + ['#{', { token: 'support.function.interpolation', bracket: '@open', next: '@variableinterpolation' }], // sass var resolve ], variableinterpolation: [ @@ -227,7 +227,7 @@ export var language = { ], controlstatement: [ - ['[@](if|else|for|while|each|media)', { token: 'keyword.flow.control.at-rule', next: '@controlstatementdeclaration'}], + ['[@](if|else|for|while|each|media)', { token: 'keyword.flow.control.at-rule', next: '@controlstatementdeclaration'}], ], controlstatementdeclaration: [ diff --git a/src/vs/languages/sass/test/common/parser.test.ts b/src/vs/languages/sass/test/common/parser.test.ts index da325247277..eb8dc41dbe5 100644 --- a/src/vs/languages/sass/test/common/parser.test.ts +++ b/src/vs/languages/sass/test/common/parser.test.ts @@ -86,12 +86,12 @@ suite('Sass - Sass Parser', () => { test('Sass Parser - SassOperator', function() { var parser = new _parser.SassParser(); - assertNode('>=', parser, parser._parseOperator.bind(parser)); - assertNode('>', parser, parser._parseOperator.bind(parser)); - assertNode('<', parser, parser._parseOperator.bind(parser)); - assertNode('<=', parser, parser._parseOperator.bind(parser)); - assertNode('==', parser, parser._parseOperator.bind(parser)); - assertNode('!=', parser, parser._parseOperator.bind(parser)); + assertNode('>=', parser, parser._parseOperator.bind(parser)); + assertNode('>', parser, parser._parseOperator.bind(parser)); + assertNode('<', parser, parser._parseOperator.bind(parser)); + assertNode('<=', parser, parser._parseOperator.bind(parser)); + assertNode('==', parser, parser._parseOperator.bind(parser)); + assertNode('!=', parser, parser._parseOperator.bind(parser)); assertNode('and', parser, parser._parseOperator.bind(parser)); assertNode('+', parser, parser._parseOperator.bind(parser)); assertNode('-', parser, parser._parseOperator.bind(parser)); diff --git a/src/vs/languages/sass/test/common/sass-worker.test.ts b/src/vs/languages/sass/test/common/sass-worker.test.ts index f1d6cfd38b0..e274a6a1030 100644 --- a/src/vs/languages/sass/test/common/sass-worker.test.ts +++ b/src/vs/languages/sass/test/common/sass-worker.test.ts @@ -30,7 +30,7 @@ suite('SASS - Worker', () => { return { worker: worker, model: model }; }; - var testSuggestionsFor = function(value:string, stringBefore:string):WinJS.TPromise { + var testSuggestionsFor = function(value:string, stringBefore:string):WinJS.TPromise { var url = new Network.URL('test://1'); var env = mockSASSWorkerEnv(url, value); @@ -39,7 +39,7 @@ suite('SASS - Worker', () => { return env.worker.suggest(url, position).then(result => result[0]); }; - var testValueSetFor = function(value:string, selection:string, selectionLength: number, up: boolean):WinJS.TPromise { + var testValueSetFor = function(value:string, selection:string, selectionLength: number, up: boolean):WinJS.TPromise { var url = new Network.URL('test://1'); var env = mockSASSWorkerEnv(url, value); @@ -49,7 +49,7 @@ suite('SASS - Worker', () => { return env.worker.inplaceReplaceSupport.navigateValueSet(url, range, up); }; - var testOccurrences = function(value:string, tokenBefore:string):WinJS.TPromise<{ occurrences: Modes.IOccurence[]; model: mm.MirrorModel }> { + var testOccurrences = function(value:string, tokenBefore:string):WinJS.TPromise<{ occurrences: Modes.IOccurence[]; model: mm.MirrorModel }> { var url = new Network.URL('test://1'); var env = mockSASSWorkerEnv(url, value); @@ -63,7 +63,7 @@ suite('SASS - Worker', () => { return suggestion.label === label && (!type || suggestion.type === type); }); if (proposalsFound.length != 1) { - assert.fail("Suggestion not found: " + label + ", has " + completion.suggestions.map(s => s.label).join(', ')); + assert.fail("Suggestion not found: " + label + ", has " + completion.suggestions.map(s => s.label).join(', ')); } }; diff --git a/src/vs/languages/sass/test/common/sass.test.ts b/src/vs/languages/sass/test/common/sass.test.ts index cc8b34d4daa..da9645d70c4 100644 --- a/src/vs/languages/sass/test/common/sass.test.ts +++ b/src/vs/languages/sass/test/common/sass.test.ts @@ -23,7 +23,7 @@ suite('Sass Colorizer', () => { }); test('', () => { - modesUtil.executeTests(tokenizationSupport, [ + modesUtil.executeTests(tokenizationSupport, [ // Nested Rules [{ line: '#main {\n width: 97%;\n p, div {\n font-size: 2em;\n a { font-weight: bold; }\n }\n pre { font-size: 3em; }\n}', @@ -1819,7 +1819,7 @@ suite('Sass Colorizer', () => { { startIndex: 13, type: 'string.punctuation.sass' }, { startIndex: 14, type: 'punctuation.sass' } ]}] - ]); + ]); }); test('identifier escaping', function() { diff --git a/src/vs/languages/typescript/common/features/quickFix.ts b/src/vs/languages/typescript/common/features/quickFix.ts index 79afd26e811..b27c13f8b17 100644 --- a/src/vs/languages/typescript/common/features/quickFix.ts +++ b/src/vs/languages/typescript/common/features/quickFix.ts @@ -104,24 +104,24 @@ function computeRenameProposals(languageService:ts.LanguageService, resource:URI } switch (entry.kind) { - case ts.ScriptElementKind.classElement: - case ts.ScriptElementKind.interfaceElement: - case ts.ScriptElementKind.typeElement: - case ts.ScriptElementKind.enumElement: - case ts.ScriptElementKind.variableElement: - case ts.ScriptElementKind.localVariableElement: - case ts.ScriptElementKind.functionElement: - case ts.ScriptElementKind.localFunctionElement: - case ts.ScriptElementKind.memberFunctionElement: - case ts.ScriptElementKind.memberGetAccessorElement: - case ts.ScriptElementKind.memberSetAccessorElement: - case ts.ScriptElementKind.memberVariableElement: - case ts.ScriptElementKind.constructorImplementationElement: - case ts.ScriptElementKind.callSignatureElement: - case ts.ScriptElementKind.indexSignatureElement: - case ts.ScriptElementKind.constructSignatureElement: - case ts.ScriptElementKind.parameterElement: - case ts.ScriptElementKind.primitiveType: + case ts.ScriptElementKind.classElement: + case ts.ScriptElementKind.interfaceElement: + case ts.ScriptElementKind.typeElement: + case ts.ScriptElementKind.enumElement: + case ts.ScriptElementKind.variableElement: + case ts.ScriptElementKind.localVariableElement: + case ts.ScriptElementKind.functionElement: + case ts.ScriptElementKind.localFunctionElement: + case ts.ScriptElementKind.memberFunctionElement: + case ts.ScriptElementKind.memberGetAccessorElement: + case ts.ScriptElementKind.memberSetAccessorElement: + case ts.ScriptElementKind.memberVariableElement: + case ts.ScriptElementKind.constructorImplementationElement: + case ts.ScriptElementKind.callSignatureElement: + case ts.ScriptElementKind.indexSignatureElement: + case ts.ScriptElementKind.constructSignatureElement: + case ts.ScriptElementKind.parameterElement: + case ts.ScriptElementKind.primitiveType: var score = strings.difference(currentWord, entry.name); if (score < currentWord.length / 2 /*score_lim*/) { diff --git a/src/vs/languages/typescript/common/features/rename.ts b/src/vs/languages/typescript/common/features/rename.ts index f400dd8a673..5d095389f46 100644 --- a/src/vs/languages/typescript/common/features/rename.ts +++ b/src/vs/languages/typescript/common/features/rename.ts @@ -35,7 +35,7 @@ function rename(project: projectService.IProject, resource: URI, position: Edito .filter(location => { return !typescript.isDefaultLib(location.fileName) }) - .map(location => { + .map(location => { return { resource: URI.parse(location.fileName), newText: newName, diff --git a/src/vs/languages/typescript/common/lint/rules/typescript.ts b/src/vs/languages/typescript/common/lint/rules/typescript.ts index b287f686125..4a003b39a38 100644 --- a/src/vs/languages/typescript/common/lint/rules/typescript.ts +++ b/src/vs/languages/typescript/common/lint/rules/typescript.ts @@ -231,7 +231,7 @@ export class UnusedFunctions implements rules.IStyleRule2 { ' (require("a")).b', '});', ]); - }); + }); test('require, strip .js-extname', function () { assertTranslation([ diff --git a/src/vs/languages/typescript/test/common/tokenization.test.ts b/src/vs/languages/typescript/test/common/tokenization.test.ts index b9f0329fccd..ab3aff8f8ce 100644 --- a/src/vs/languages/typescript/test/common/tokenization.test.ts +++ b/src/vs/languages/typescript/test/common/tokenization.test.ts @@ -55,7 +55,7 @@ suite('TS/JS - syntax highlighting', () => { }); test('', () => { - modesUtil.executeTests(tokenizationSupport, [ + modesUtil.executeTests(tokenizationSupport, [ // Keywords [{ diff --git a/src/vs/platform/contextview/browser/contextMenuHandler.css b/src/vs/platform/contextview/browser/contextMenuHandler.css index 4f801584f86..ee7fd3f7968 100644 --- a/src/vs/platform/contextview/browser/contextMenuHandler.css +++ b/src/vs/platform/contextview/browser/contextMenuHandler.css @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - + .context-view .monaco-menu { min-width: 130px; } diff --git a/src/vs/platform/instantiation/common/instantiationService.ts b/src/vs/platform/instantiation/common/instantiationService.ts index 039edb2595d..d2ce123395a 100644 --- a/src/vs/platform/instantiation/common/instantiationService.ts +++ b/src/vs/platform/instantiation/common/instantiationService.ts @@ -245,9 +245,9 @@ class ServicesMap { if (actualFirstServiceIndex !== Number.MAX_VALUE && actualFirstServiceIndex !== expectedFirstServiceIndex) { - let msg = `[createInstance] constructor '${descriptor.ctor.name}' has first\ - service dependency at position ${actualFirstServiceIndex + 1} but is called with\ - ${expectedFirstServiceIndex - 1} static arguments that are expected to come first`; + let msg = `[createInstance] constructor '${descriptor.ctor.name}' has first` + + ` service dependency at position ${actualFirstServiceIndex + 1} but is called with` + + ` ${expectedFirstServiceIndex - 1} static arguments that are expected to come first`; // throw new Error(msg); console.warn(msg); diff --git a/src/vs/platform/keybinding/test/common/keybindingService.test.ts b/src/vs/platform/keybinding/test/common/keybindingService.test.ts index e81b50e4b3f..f2d614886f3 100644 --- a/src/vs/platform/keybinding/test/common/keybindingService.test.ts +++ b/src/vs/platform/keybinding/test/common/keybindingService.test.ts @@ -15,26 +15,26 @@ import {KeyMod, KeyCode, BinaryKeybindings} from 'vs/base/common/keyCodes'; suite('Keybinding Service', () => { test('resolve key', function() { - var keybinding = KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_Z; - var contextRules = [{ - key: 'bar', - operator: 'equal', - operand: 'baz' - }] - var keybindingItem: IKeybindingItem = { - command: 'yes', - context: contextRules, - keybinding: keybinding, - weight1: 0, - weight2: 0 - }; + var keybinding = KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_Z; + var contextRules = [{ + key: 'bar', + operator: 'equal', + operand: 'baz' + }] + var keybindingItem: IKeybindingItem = { + command: 'yes', + context: contextRules, + keybinding: keybinding, + weight1: 0, + weight2: 0 + }; - assert.equal(CommonKeybindingResolver.contextMatchesRules({ bar: 'baz' }, contextRules), true); - assert.equal(CommonKeybindingResolver.contextMatchesRules({ bar: 'bz' }, contextRules), false); + assert.equal(CommonKeybindingResolver.contextMatchesRules({ bar: 'baz' }, contextRules), true); + assert.equal(CommonKeybindingResolver.contextMatchesRules({ bar: 'bz' }, contextRules), false); - var resolver = new CommonKeybindingResolver([keybindingItem], []); - assert.equal(resolver.resolve({ bar: 'baz' }, 0, keybinding).commandId, 'yes'); - assert.equal(resolver.resolve({ bar: 'bz' }, 0, keybinding), null); + var resolver = new CommonKeybindingResolver([keybindingItem], []); + assert.equal(resolver.resolve({ bar: 'baz' }, 0, keybinding).commandId, 'yes'); + assert.equal(resolver.resolve({ bar: 'bz' }, 0, keybinding), null); }); function createEqualContextRule(key: string, operand: any): IKeybindingContextRule { diff --git a/src/vs/platform/telemetry/common/abstractTelemetryService.ts b/src/vs/platform/telemetry/common/abstractTelemetryService.ts index b6f6b99b00f..ef30a90e0cd 100644 --- a/src/vs/platform/telemetry/common/abstractTelemetryService.ts +++ b/src/vs/platform/telemetry/common/abstractTelemetryService.ts @@ -2,8 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - 'use strict'; - +'use strict'; + import Errors = require('vs/base/common/errors'); import Types = require('vs/base/common/types'); import Platform = require('vs/base/common/platform'); @@ -278,7 +278,7 @@ export abstract class AbstractTelemetryService implements ITelemetryService { } export var Extenstions = { - TelemetryAppenders : 'telemetry.appenders' + TelemetryAppenders : 'telemetry.appenders' }; export interface ITelemetryAppendersRegistry { diff --git a/src/vs/platform/telemetry/test/node/telemetryService.test.ts b/src/vs/platform/telemetry/test/node/telemetryService.test.ts index 04ae326e571..2fdb36646a2 100644 --- a/src/vs/platform/telemetry/test/node/telemetryService.test.ts +++ b/src/vs/platform/telemetry/test/node/telemetryService.test.ts @@ -76,12 +76,12 @@ class ErrorTestingSettings { ' at t.AllWorkers (a/path/that/doesnt/contain/code/names.js:6:8844)', ' at e.(anonymous function) [as _modelEvents] (a/path/that/doesnt/contain/code/names.js:5:29552)', ' at Function. (a/path/that/doesnt/contain/code/names.js:6:8272)', - ' at e.dispatch (a/path/that/doesnt/contain/code/names.js:5:26931)', - ' at e.request (a/path/that/doesnt/contain/code/names.js:14:1745)', - ' at t._handleMessage (another/path/that/doesnt/contain/code/names.js:14:17447)', - ' at t._onmessage (another/path/that/doesnt/contain/code/names.js:14:16976)', - ' at t.onmessage (another/path/that/doesnt/contain/code/names.js:14:15854)', - ' at DedicatedWorkerGlobalScope.self.onmessage', + ' at e.dispatch (a/path/that/doesnt/contain/code/names.js:5:26931)', + ' at e.request (a/path/that/doesnt/contain/code/names.js:14:1745)', + ' at t._handleMessage (another/path/that/doesnt/contain/code/names.js:14:17447)', + ' at t._onmessage (another/path/that/doesnt/contain/code/names.js:14:16976)', + ' at t.onmessage (another/path/that/doesnt/contain/code/names.js:14:15854)', + ' at DedicatedWorkerGlobalScope.self.onmessage', this.dangerousPathWithImportantInfo, this.dangerousPathWithoutImportantInfo, this.missingModelMessage, @@ -378,7 +378,7 @@ suite('TelemetryService', () => { (window.onerror)('Error Message', 'file.js', 2, 42, testError); this.clock.tick(AbstractTelemetryService.AbstractTelemetryService.ERROR_FLUSH_TIMEOUT); - assert.equal(errorStub.alwaysCalledWithExactly('Error Message', 'file.js', 2, 42, testError), true); + assert.equal(errorStub.alwaysCalledWithExactly('Error Message', 'file.js', 2, 42, testError), true); assert.equal(errorStub.callCount, 1); assert.equal(testAppender.getEventsCount(), 1); diff --git a/src/vs/workbench/browser/media/vs-dark-theme.css b/src/vs/workbench/browser/media/vs-dark-theme.css index 10fd983545a..02afeab1fcb 100644 --- a/src/vs/workbench/browser/media/vs-dark-theme.css +++ b/src/vs/workbench/browser/media/vs-dark-theme.css @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - + /* General Theme Colors */ .monaco-workbench.vs-dark { background-color: #252526; color: #CCC; } @@ -19,7 +19,7 @@ /* Input Fields */ .monaco-workbench.vs-dark input, .monaco-workbench.vs-dark textarea { - background-color: #3C3C3C; + background-color: #3C3C3C; } .monaco-workbench.vs-dark input:disabled { diff --git a/src/vs/workbench/browser/media/vs-theme.css b/src/vs/workbench/browser/media/vs-theme.css index 48c3a7ae118..04e26de752b 100644 --- a/src/vs/workbench/browser/media/vs-theme.css +++ b/src/vs/workbench/browser/media/vs-theme.css @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - + /* General Theme Colors */ .monaco-workbench { background-color: #F3F3F3; } diff --git a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css index 10e23492cec..4916dda4ab3 100644 --- a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css +++ b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - + .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item { display: block; position: relative; @@ -70,12 +70,12 @@ .monaco-workbench > .activitybar > .content .monaco-action-bar .badge .badge-content { position: absolute; top: 20px; - right: 8px; + right: 8px; font-size: 11px; min-width: 8px; height: 18px; line-height: 18px; - padding: 0 5px; + padding: 0 5px; border-radius: 20px; text-align: center; color: white; @@ -92,8 +92,8 @@ position: absolute; top: 15px; right: 0; - width: 0; - height: 0; + width: 0; + height: 0; border-top: 5px solid transparent; border-bottom: 5px solid transparent; border-right: 5px solid #F6F6F6; @@ -104,8 +104,8 @@ position: absolute; top: 15px; right: 0; - width: 0; - height: 0; + width: 0; + height: 0; border-top: 5px solid transparent; border-bottom: 5px solid transparent; border-right: 5px solid #252526; @@ -116,8 +116,8 @@ position: absolute; top: 15px; left: 0; - width: 0; - height: 0; + width: 0; + height: 0; border-top: 5px solid transparent; border-bottom: 5px solid transparent; border-left: 5px solid #F6F6F6; @@ -128,8 +128,8 @@ position: absolute; top: 15px; left: 0; - width: 0; - height: 0; + width: 0; + height: 0; border-top: 5px solid transparent; border-bottom: 5px solid transparent; border-left: 5px solid #252526; @@ -154,7 +154,7 @@ .monaco-workbench > .activitybar.right > .content .monaco-action-bar .badge { left: auto; - right: 0; + right: 0; } /* High Contrast Theming */ diff --git a/src/vs/workbench/browser/parts/editor/media/sidebyside.css b/src/vs/workbench/browser/parts/editor/media/sidebyside.css index dbe507125d3..cba3aea0fc4 100644 --- a/src/vs/workbench/browser/parts/editor/media/sidebyside.css +++ b/src/vs/workbench/browser/parts/editor/media/sidebyside.css @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - /* Editor Container Styles */ +/* Editor Container Styles */ .monaco-workbench.vs .editor > .content.dragged { background-color: #F3F3F3; @@ -17,7 +17,7 @@ border-right: 1px solid #444; } - .monaco-workbench .editor > .content > .one-editor-container { +.monaco-workbench .editor > .content > .one-editor-container { position: absolute; /* use border box to be able to draw a border as separator between editors */ diff --git a/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css b/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css index 5f138848ea7..6a441aaeaa6 100644 --- a/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css +++ b/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - + .monaco-workbench > .sidebar > .title { display: block !important; /* Enable Title visibility */ } @@ -81,11 +81,11 @@ } /* High Contrast Theming */ -.monaco-workbench.hc-black > .sidebar.left { +.monaco-workbench.hc-black > .sidebar.left { border-right: 1px solid #6FC3DF; } -.monaco-workbench.hc-black > .sidebar.right { +.monaco-workbench.hc-black > .sidebar.right { border-left: 1px solid #6FC3DF; } diff --git a/src/vs/workbench/electron-main/bootstrap.js b/src/vs/workbench/electron-main/bootstrap.js index 6944b408c29..2522c0586cb 100644 --- a/src/vs/workbench/electron-main/bootstrap.js +++ b/src/vs/workbench/electron-main/bootstrap.js @@ -50,8 +50,8 @@ app.once('ready', function() { var loader = require('../../loader'); loader.config({ - nodeRequire: require, - nodeMain: __filename, + nodeRequire: require, + nodeMain: __filename, baseUrl: uriFromPath(path.dirname(path.dirname(path.dirname((__dirname))))) }); diff --git a/src/vs/workbench/parts/debug/browser/media/debugViewlet.css b/src/vs/workbench/parts/debug/browser/media/debugViewlet.css index 91c8796887a..783424b7385 100644 --- a/src/vs/workbench/parts/debug/browser/media/debugViewlet.css +++ b/src/vs/workbench/parts/debug/browser/media/debugViewlet.css @@ -56,7 +56,7 @@ .vs-dark.monaco-workbench .debug-select { background-color: #3C3C3C; - border-color: #3C3C3C; + border-color: #3C3C3C; color: rgb(204, 204, 204); } diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensions.css b/src/vs/workbench/parts/extensions/electron-browser/extensions.css index 35222a3a9c7..87d0cc98a20 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensions.css +++ b/src/vs/workbench/parts/extensions/electron-browser/extensions.css @@ -91,9 +91,9 @@ } .quick-open-widget .extension .actions .action-item.disabled .action-label { - animation: move-background 0.5s linear infinite; - background-color: rgba(132, 132, 132, 0.5); - background-size: 8px; + animation: move-background 0.5s linear infinite; + background-color: rgba(132, 132, 132, 0.5); + background-size: 8px; background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.5) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.5) 50%, rgba(255, 255, 255, 0.5) 75%, transparent 75%, transparent); color: rgb(0, 0, 0); border-color: rgb(0, 0, 0); diff --git a/src/vs/workbench/parts/git/browser/views/changes/changesView.ts b/src/vs/workbench/parts/git/browser/views/changes/changesView.ts index d6c92aa997b..a2778356629 100644 --- a/src/vs/workbench/parts/git/browser/views/changes/changesView.ts +++ b/src/vs/workbench/parts/git/browser/views/changes/changesView.ts @@ -392,15 +392,15 @@ export class ChangesView extends EventEmitter.EventEmitter implements GitView.IV if (input instanceof GitEditorInputs.GitDiffEditorInput) { return ( input).getFileStatus(); - } + } if (input instanceof GitEditorInputs.GitIndexEditorInput) { return ( input).getFileStatus() || null; - } + } if (input instanceof GitEditorInputs.NativeGitIndexStringEditorInput) { return ( input).getFileStatus() || null; - } + } if (input instanceof Files.FileEditorInput) { var fileInput = input; @@ -419,7 +419,7 @@ export class ChangesView extends EventEmitter.EventEmitter implements GitView.IV if (status) { return status; } - } + } return null; } diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts b/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts index 85e3b10c983..b6e1e4b45b0 100644 --- a/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts +++ b/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts @@ -112,7 +112,7 @@ function fileExists(path: string): winjs.TPromise { function createFile(path: string, content: string): winjs.Promise { return new winjs.Promise((c, e, p) => { fs.writeFile(path, content, function(err) { - if(err) { + if(err) { e(err); } c(true); diff --git a/src/vs/workbench/parts/tasks/node/processRunnerSystem.ts b/src/vs/workbench/parts/tasks/node/processRunnerSystem.ts index 0be4f28e842..168d832d9d1 100644 --- a/src/vs/workbench/parts/tasks/node/processRunnerSystem.ts +++ b/src/vs/workbench/parts/tasks/node/processRunnerSystem.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - 'use strict'; +'use strict'; import * as nls from 'vs/nls'; import * as Objects from 'vs/base/common/objects'; diff --git a/src/vs/workbench/parts/tasks/test/node/configuration.test.ts b/src/vs/workbench/parts/tasks/test/node/configuration.test.ts index 4c50b64f079..af5ecfd723b 100644 --- a/src/vs/workbench/parts/tasks/test/node/configuration.test.ts +++ b/src/vs/workbench/parts/tasks/test/node/configuration.test.ts @@ -433,9 +433,9 @@ suite('Tasks Configuration parsing tests', () => { showOutput(Platform.isWindows ? TaskSystem.ShowOutput.Always : TaskSystem.ShowOutput.Never). suppressTaskName(true); let external: ExternalTaskRunnerConfiguration = { - version: '0.1.0', - command: 'tsc', - showOutput: 'never', + version: '0.1.0', + command: 'tsc', + showOutput: 'never', windows: { showOutput: 'always' } @@ -450,8 +450,8 @@ suite('Tasks Configuration parsing tests', () => { echoCommand(Platform.isWindows ? false : true). suppressTaskName(true); let external: ExternalTaskRunnerConfiguration = { - version: '0.1.0', - command: 'tsc', + version: '0.1.0', + command: 'tsc', echoCommand: true, windows: { echoCommand: false diff --git a/src/vs/workbench/parts/telemetry/node/nodeAppInsightsTelemetryAppender.ts b/src/vs/workbench/parts/telemetry/node/nodeAppInsightsTelemetryAppender.ts index ffb14c61643..0c105af900a 100644 --- a/src/vs/workbench/parts/telemetry/node/nodeAppInsightsTelemetryAppender.ts +++ b/src/vs/workbench/parts/telemetry/node/nodeAppInsightsTelemetryAppender.ts @@ -67,11 +67,11 @@ export class NodeAppInsightsTelemetryAppender implements ITelemetryAppender { if (key) { this.appInsights = appInsights.setup(key) - .setAutoCollectRequests(false) - .setAutoCollectPerformance(false) - .setAutoCollectExceptions(false) + .setAutoCollectRequests(false) + .setAutoCollectPerformance(false) + .setAutoCollectExceptions(false) .setOfflineMode(true) - .start() + .start() .client; this.setupAIClient(this.appInsights); @@ -91,7 +91,7 @@ export class NodeAppInsightsTelemetryAppender implements ITelemetryAppender { if (client && client.context && client.context.keys && client.context.tags) { var machineNameKey = client.context.keys.deviceMachineName; - client.context.tags[machineNameKey] = ''; + client.context.tags[machineNameKey] = ''; } } diff --git a/test/all.js b/test/all.js index 026312e7b33..bc6c7a5c0e1 100644 --- a/test/all.js +++ b/test/all.js @@ -77,8 +77,8 @@ function main() { }); var loaderConfig = { - nodeRequire: require, - nodeMain: __filename, + nodeRequire: require, + nodeMain: __filename, baseUrl: path.join(path.dirname(__dirname)), paths: { 'vs': out + '/vs', diff --git a/test/index.html b/test/index.html index 3f34a99be8a..ce20f387747 100644 --- a/test/index.html +++ b/test/index.html @@ -1,16 +1,16 @@ - - VSCode Tests - + + VSCode Tests + -
+
- - - + + +