From 7e5cb3e7ac298d5282a4a9d19ce385089219aa8d Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 13 Aug 2019 14:51:04 +0200 Subject: [PATCH] Fix indentation --- scripts/runDaily.js | 28 ++++++++++++++-------------- src/languageFeatures.ts | 18 +++++++++--------- src/monaco.contribution.ts | 37 ++++++++++++++++++------------------- 3 files changed, 41 insertions(+), 42 deletions(-) diff --git a/scripts/runDaily.js b/scripts/runDaily.js index 21a0b1fb..a5fccf27 100644 --- a/scripts/runDaily.js +++ b/scripts/runDaily.js @@ -8,22 +8,22 @@ const { execSync } = require("child_process"); const { join } = require("path"); const { readFileSync, writeFileSync } = require("fs"); - // Update to the daily build - execSync("npm install --save typescript@next"); +// Update to the daily build +execSync("npm install --save typescript@next"); - // Update the dts files - execSync("npm run import-typescript"); +// Update the dts files +execSync("npm run import-typescript"); - // Sync the versions - const packagePath = join(__dirname, "../package.json"); - const package = JSON.parse(readFileSync(packagePath, "utf8")); +// Sync the versions +const packagePath = join(__dirname, "../package.json"); +const package = JSON.parse(readFileSync(packagePath, "utf8")); - const tsPackagePath = join(__dirname, "../node_modules/typescript/package.json"); - const tsPackage = JSON.parse(readFileSync(tsPackagePath, "utf8")); +const tsPackagePath = join(__dirname, "../node_modules/typescript/package.json"); +const tsPackage = JSON.parse(readFileSync(tsPackagePath, "utf8")); - // Set the monaco-typescript version to directly match the typescript nightly version - package.version = tsPackage.version; - writeFileSync(packagePath, JSON.stringify(package), "utf8"); +// Set the monaco-typescript version to directly match the typescript nightly version +package.version = tsPackage.version; +writeFileSync(packagePath, JSON.stringify(package), "utf8"); - // Update the dts files - execSync("npm run compile"); +// Update the dts files +execSync("npm run compile"); diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts index d51701b4..4dde0166 100644 --- a/src/languageFeatures.ts +++ b/src/languageFeatures.ts @@ -25,25 +25,25 @@ enum IndentStyle { export function flattenDiagnosticMessageText(diag: string | ts.DiagnosticMessageChain | undefined, newLine: string, indent = 0): string { if (typeof diag === "string") { - return diag; + return diag; } else if (diag === undefined) { - return ""; + return ""; } let result = ""; if (indent) { - result += newLine; + result += newLine; - for (let i = 0; i < indent; i++) { - result += " "; - } + for (let i = 0; i < indent; i++) { + result += " "; + } } result += diag.messageText; indent++; if (diag.next) { - for (const kid of diag.next) { - result += flattenDiagnosticMessageText(kid, newLine, indent); - } + for (const kid of diag.next) { + result += flattenDiagnosticMessageText(kid, newLine, indent); + } } return result; } diff --git a/src/monaco.contribution.ts b/src/monaco.contribution.ts index de852803..4e8b60fc 100644 --- a/src/monaco.contribution.ts +++ b/src/monaco.contribution.ts @@ -144,15 +144,14 @@ export class LanguageServiceDefaultsImpl implements monaco.languages.typescript. //#region enums copied from typescript to prevent loading the entire typescriptServices --- - enum ModuleKind { - None = 0, - CommonJS = 1, - AMD = 2, - UMD = 3, - System = 4, - ES2015 = 5, - ESNext = 99 + None = 0, + CommonJS = 1, + AMD = 2, + UMD = 3, + System = 4, + ES2015 = 5, + ESNext = 99 } enum JsxEmit { @@ -168,17 +167,17 @@ enum NewLineKind { } enum ScriptTarget { - ES3 = 0, - ES5 = 1, - ES2015 = 2, - ES2016 = 3, - ES2017 = 4, - ES2018 = 5, - ES2019 = 6, - ES2020 = 7, - ESNext = 99, - JSON = 100, - Latest = ESNext, + ES3 = 0, + ES5 = 1, + ES2015 = 2, + ES2016 = 3, + ES2017 = 4, + ES2018 = 5, + ES2019 = 6, + ES2020 = 7, + ESNext = 99, + JSON = 100, + Latest = ESNext, } enum ModuleResolutionKind {