diff --git a/.eslintrc b/.eslintrc index f873c3c7619..4cf339e94d8 100644 --- a/.eslintrc +++ b/.eslintrc @@ -54,7 +54,7 @@ "microsoft-typescript/no-type-assertion-whitespace": "error", "microsoft-typescript/type-operator-spacing": "error", "microsoft-typescript/only-arrow-functions": "off", - "microsoft-typescript/no-double-space": "off", + "microsoft-typescript/no-double-space": "error", "microsoft-typescript/boolean-trivia": "error", "microsoft-typescript/no-in-operator": "off", "microsoft-typescript/debug-assert": "error", diff --git a/src/lib/es2015.core.d.ts b/src/lib/es2015.core.d.ts index 4d48d5cf40a..2f337b0eecf 100644 --- a/src/lib/es2015.core.d.ts +++ b/src/lib/es2015.core.d.ts @@ -312,7 +312,7 @@ interface ObjectConstructor { is(value1: any, value2: any): boolean; /** - * Sets the prototype of a specified object o to object proto or null. Returns the object o. + * Sets the prototype of a specified object o to object proto or null. Returns the object o. * @param o The object to change its prototype. * @param proto The value of the new prototype or null. */ diff --git a/src/lib/es2017.object.d.ts b/src/lib/es2017.object.d.ts index 1790ce76894..b3ace85bef1 100644 --- a/src/lib/es2017.object.d.ts +++ b/src/lib/es2017.object.d.ts @@ -3,7 +3,7 @@ interface ObjectConstructor { * Returns an array of values of the enumerable properties of an object * @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object. */ - values(o: { [s: string]: T } | ArrayLike): T[]; + values(o: { [s: string]: T } | ArrayLike): T[]; /** * Returns an array of values of the enumerable properties of an object diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts index 998e45bd461..40d4a703dd2 100644 --- a/src/services/signatureHelp.ts +++ b/src/services/signatureHelp.ts @@ -394,11 +394,11 @@ namespace ts.SignatureHelp { // not enough to put us in the substitution expression; we should consider ourselves part of // the *next* span's expression by offsetting the index (argIndex = (spanIndex + 1) + 1). // - // tslint:disable no-double-space + /* eslint-disable microsoft-typescript/no-double-space */ // Example: f `# abcd $#{# 1 + 1# }# efghi ${ #"#hello"# } # ` // ^ ^ ^ ^ ^ ^ ^ ^ ^ // Case: 1 1 3 2 1 3 2 2 1 - // tslint:enable no-double-space + /* eslint-enable microsoft-typescript/no-double-space */ Debug.assert(position >= node.getStart(), "Assumed 'position' could not occur before node."); if (isTemplateLiteralToken(node)) { if (isInsideTemplateLiteral(node, position, sourceFile)) {