diff --git a/extensions/json/src/jsonMain.ts b/extensions/json/src/jsonMain.ts index 3e196cf8dae..bd3c55b74f7 100644 --- a/extensions/json/src/jsonMain.ts +++ b/extensions/json/src/jsonMain.ts @@ -30,7 +30,7 @@ export function activate(context: ExtensionContext) { // The server is implemented in node let serverModule = context.asAbsolutePath(path.join('server', 'out', 'server.js')); // The debug options for the server - let debugOptions = { execArgv: ["--nolazy", "--debug=6004"] }; + let debugOptions = { execArgv: ['--nolazy', '--debug=6004'] }; // If the extension is launch in debug mode the debug server options are use // Otherwise the run options are used diff --git a/src/vs/base/browser/keyboardEvent.ts b/src/vs/base/browser/keyboardEvent.ts index 5f31a0f570e..e4b52599d52 100644 --- a/src/vs/base/browser/keyboardEvent.ts +++ b/src/vs/base/browser/keyboardEvent.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -"use strict"; +'use strict'; import * as Platform from 'vs/base/common/platform'; import * as Browser from 'vs/base/browser/browser'; diff --git a/src/vs/base/common/keyCodes.ts b/src/vs/base/common/keyCodes.ts index 0e3110062b1..2f78a51fbee 100644 --- a/src/vs/base/common/keyCodes.ts +++ b/src/vs/base/common/keyCodes.ts @@ -3,7 +3,7 @@ * 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 defaultPlatform from 'vs/base/common/platform'; @@ -561,10 +561,10 @@ export class Keybinding { private static _cachedKeybindingRegex: string = null; public static getUserSettingsKeybindingRegex(): string { if (!this._cachedKeybindingRegex) { - let numpadKey = "numpad(0|1|2|3|4|5|6|7|8|9|_multiply|_add|_subtract|_decimal|_divide|_separator)"; - let oemKey = "`|\\-|=|\\[|\\]|\\\\\\\\|;|'|,|\\.|\\/|oem_8|oem_102"; - let specialKey = "left|up|right|down|pageup|pagedown|end|home|tab|enter|escape|space|backspace|delete|pausebreak|capslock|insert|contextmenu|numlock|scrolllock"; - let casualKey = "[a-z]|[0-9]|f(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19)"; + let numpadKey = 'numpad(0|1|2|3|4|5|6|7|8|9|_multiply|_add|_subtract|_decimal|_divide|_separator)'; + let oemKey = '`|\\-|=|\\[|\\]|\\\\\\\\|;|\'|,|\\.|\\/|oem_8|oem_102'; + let specialKey = 'left|up|right|down|pageup|pagedown|end|home|tab|enter|escape|space|backspace|delete|pausebreak|capslock|insert|contextmenu|numlock|scrolllock'; + let casualKey = '[a-z]|[0-9]|f(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19)'; let key = '((' + [numpadKey, oemKey, specialKey, casualKey].join(')|(') + '))'; let mod = '((ctrl|shift|alt|cmd|win|meta)\\+)*'; let keybinding = '(' + mod + key + ')'; diff --git a/src/vs/base/common/strings.ts b/src/vs/base/common/strings.ts index 2f6cea2a53e..345ea92c2d9 100644 --- a/src/vs/base/common/strings.ts +++ b/src/vs/base/common/strings.ts @@ -236,7 +236,7 @@ export function createSafeRegExp(searchString:string, isRegex:boolean, matchCase export function regExpLeadsToEndlessLoop(regexp: RegExp): boolean { // Exit early if it's one of these special cases which are meant to match // against an empty string - if (regexp.source === "^" || regexp.source === "^$" || regexp.source === "$") { + if (regexp.source === '^' || regexp.source === '^$' || regexp.source === '$') { return false; } diff --git a/src/vs/editor/browser/standalone/standaloneSchemas.ts b/src/vs/editor/browser/standalone/standaloneSchemas.ts index e5a3052207b..10ed7efc5e4 100644 --- a/src/vs/editor/browser/standalone/standaloneSchemas.ts +++ b/src/vs/editor/browser/standalone/standaloneSchemas.ts @@ -748,7 +748,7 @@ MonacoEditorSchemas['http://json.schemastore.org/tsconfig'] = { }, 'watch': { 'description': nls.localize('tsconfig.json.compilerOptions.watch', "Watch input files."), - "type": 'boolean' + 'type': 'boolean' }, 'jsx': { 'description': nls.localize('tsconfig.json.compilerOptions.jsx', "Enable the JSX option (requires TypeScript 1.6): 'preserve', 'react'."), diff --git a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts b/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts index 99f523daf76..085c2e2b53c 100644 --- a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts +++ b/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts @@ -177,11 +177,11 @@ export class ViewCursors extends ViewPart { if (this._editorHasFocus) { if (this._primaryCursor.getIsInEditableRange() && !this._context.configuration.editor.readOnly) { switch (this._context.configuration.editor.cursorBlinking) { - case ("blink"): + case 'blink': return RenderType.Blink; - case ("visible"): + case 'visible': return RenderType.Visible; - case ("hidden"): + case 'hidden': return RenderType.Hidden; default: return RenderType.Blink; diff --git a/src/vs/editor/node/languageConfiguration.ts b/src/vs/editor/node/languageConfiguration.ts index 6ba8268c611..bd650419ed5 100644 --- a/src/vs/editor/node/languageConfiguration.ts +++ b/src/vs/editor/node/languageConfiguration.ts @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; +import * as nls from 'vs/nls'; import {IModeService} from 'vs/editor/common/services/modeService'; import {LanguageExtensions} from 'vs/editor/common/modes/languageExtensionPoint'; import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; @@ -51,7 +52,7 @@ export class LanguageConfigurationFileHandler { var errors = []; var configuration = json.parse(fileContents.toString(), errors); if (errors.length) { - console.error("Errors parsing " + configFilePath + ": " + errors.join('\n')); + console.error(nls.localize('parseErrors', "Errors parsing {0}: {1}", configFilePath, errors.join('\n'))); } this._handleConfig(modeId, configuration); }, (err) => { diff --git a/src/vs/editor/standalone-languages/r.ts b/src/vs/editor/standalone-languages/r.ts index 35204a423b2..f8200fb07ac 100644 --- a/src/vs/editor/standalone-languages/r.ts +++ b/src/vs/editor/standalone-languages/r.ts @@ -117,7 +117,7 @@ export var language = { '\\a', '\\f', '\\v', - "\\'", + '\\\'', '\\"', '\\\\' ], diff --git a/src/vs/workbench/electron-browser/darwin/cli.contribution.ts b/src/vs/workbench/electron-browser/darwin/cli.contribution.ts index 696c4b4dd40..5df5927ed24 100644 --- a/src/vs/workbench/electron-browser/darwin/cli.contribution.ts +++ b/src/vs/workbench/electron-browser/darwin/cli.contribution.ts @@ -168,7 +168,7 @@ class UninstallAction extends Action { run(): TPromise { return pfs.unlink(this.target) .then(null, ignore('ENOENT')) - .then(() => this.messageService.show(Severity.Info, nls.localize('success', 'Shortcut \'{0}\' successfully uninstalled from PATH.', this.applicationName))) + .then(() => this.messageService.show(Severity.Info, nls.localize('success', 'Shortcut \'{0}\' successfully uninstalled from PATH.', this.applicationName))); } } diff --git a/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts b/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts index c13958c5d38..5bb5cf4a9ed 100644 --- a/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts +++ b/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts @@ -492,17 +492,17 @@ export function registerContributions(): void { title: nls.localize('gitConfigurationTitle', "Git configuration"), type: 'object', properties: { - "git.enabled": { + 'git.enabled': { type: 'boolean', description: nls.localize('gitEnabled', "Is git enabled"), default: true }, - "git.path": { + 'git.path': { type: ['string', 'null'], description: nls.localize('gitPath', "Path to the git executable"), default: null }, - "git.autofetch": { + 'git.autofetch': { type: 'boolean', description: nls.localize('gitAutoFetch', "Whether auto fetching is enabled."), default: true diff --git a/src/vs/workbench/parts/tasks/common/tasks.ts b/src/vs/workbench/parts/tasks/common/tasks.ts index 59bf0f9fabb..edec04c296c 100644 --- a/src/vs/workbench/parts/tasks/common/tasks.ts +++ b/src/vs/workbench/parts/tasks/common/tasks.ts @@ -13,7 +13,7 @@ import * as UUID from 'vs/base/common/uuid'; import { ValidationStatus, ValidationState, ILogger, Parser } from 'vs/base/common/parsers'; import { Executable, ExecutableParser, Config as ProcessConfig} from 'vs/base/common/processes'; -import { ProblemMatcher, Config as ProblemMatcherConfig, ProblemMatcherParser, registry as ProblemMatcherRegistry } from 'vs/platform/markers/common/problemMatcher'; +import { ProblemMatcher, Config as ProblemMatcherConfig, ProblemMatcherParser } from 'vs/platform/markers/common/problemMatcher'; export namespace Config { diff --git a/src/vs/workbench/parts/tasks/node/processRunnerConfiguration.ts b/src/vs/workbench/parts/tasks/node/processRunnerConfiguration.ts index d20c4a0fd19..d744817ea01 100644 --- a/src/vs/workbench/parts/tasks/node/processRunnerConfiguration.ts +++ b/src/vs/workbench/parts/tasks/node/processRunnerConfiguration.ts @@ -29,9 +29,9 @@ export class ProblemHandling { } export namespace ShowOutput { - let always: string = 'always'; - let silent: string = 'silent'; - let never: string = 'never'; + // let always: string = 'always'; + // let silent: string = 'silent'; + // let never: string = 'never'; } /** diff --git a/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts b/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts index dad2a7776d6..d38f0c18bee 100644 --- a/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts +++ b/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts @@ -84,12 +84,12 @@ class GruntTaskMatcher implements TaskDetectorMatcher { // // Tasks run in the order specified if (!this.tasksStart && !this.tasksEnd) { - if (line.indexOf('Available tasks') == 0) { + if (line.indexOf('Available tasks') === 0) { this.tasksStart = true; } } else if (this.tasksStart && !this.tasksEnd) { - if (line.indexOf('Tasks run in the order specified') == 0) { + if (line.indexOf('Tasks run in the order specified') === 0) { this.tasksEnd = true; } else { if (this.descriptionOffset === null) {