fixes: merge issue in test baselines, linter

vladima · vladima · commit f361ed19c178 · 2016-09-27T15:04:34.000-07:00
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -1152,7 +1152,7 @@ namespace ts {
     export function convertToRelativePath(absoluteOrRelativePath: string, basePath: string, getCanonicalFileName: (path: string) => string): string {
         return !isRootedDiskPath(absoluteOrRelativePath)
             ? absoluteOrRelativePath
-            : getRelativePathToDirectoryOrUrl(basePath, absoluteOrRelativePath, basePath, getCanonicalFileName, /* isAbsolutePathAnUrl */ false);
+            : getRelativePathToDirectoryOrUrl(basePath, absoluteOrRelativePath, basePath, getCanonicalFileName, /*isAbsolutePathAnUrl*/ false);
     }
 
     function normalizedPathComponents(path: string, rootLength: number) {
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -1116,7 +1116,7 @@ namespace ts.server {
         private getNavigateToItems(args: protocol.NavtoRequestArgs, simplifiedResult: boolean): protocol.NavtoItem[] | NavigateToItem[] {
             const projects = this.getProjects(args);
 
-            const fileName = args.currentFileOnly ? args.file && normalizeSlashes(args.file) : undefined
+            const fileName = args.currentFileOnly ? args.file && normalizeSlashes(args.file) : undefined;
             if (simplifiedResult) {
                 return combineProjectOutput(
                     projects,
@@ -1329,8 +1329,8 @@ namespace ts.server {
                 return this.requiredResponse(this.getTypeDefinition(request.arguments));
             },
             [CommandNames.Implementation]: (request: protocol.Request) => {
-                return this.requiredResponse(this.getImplementation(request.arguments))
-            },            
+                return this.requiredResponse(this.getImplementation(request.arguments));
+            },
             [CommandNames.References]: (request: protocol.FileLocationRequest) => {
                 return this.requiredResponse(this.getReferences(request.arguments, /*simplifiedResult*/ true));
             },
diff --git a/src/services/types.ts b/src/services/types.ts
@@ -152,7 +152,7 @@ namespace ts {
          * LS host can optionally implement these methods to support automatic updating when new type libraries are installed
          */
         getTypeRootsVersion?(): number;
- 
+
         /*
          * LS host can optionally implement this method if it wants to be completely in charge of module name resolution.
          * if implementation is omitted then language service will use built-in module resolution logic and get answers to
diff --git a/tests/baselines/reference/arrayBestCommonTypes.types b/tests/baselines/reference/arrayBestCommonTypes.types
@@ -257,13 +257,13 @@ module EmptyTypes {
 >base : base
 >[{ x: true, y: new derived() }, { x: false, y: new base() }] : ({ x: true; y: derived; } | { x: false; y: base; })[]
 >{ x: true, y: new derived() } : { x: true; y: derived; }
->x : true
+>x : boolean
 >true : true
 >y : derived
 >new derived() : derived
 >derived : typeof derived
 >{ x: false, y: new base() } : { x: false; y: base; }
->x : false
+>x : boolean
 >false : false
 >y : base
 >new base() : base
@@ -660,13 +660,13 @@ module NonEmptyTypes {
 >base : base
 >[{ x: true, y: new derived() }, { x: false, y: new base() }] : ({ x: true; y: derived; } | { x: false; y: base; })[]
 >{ x: true, y: new derived() } : { x: true; y: derived; }
->x : true
+>x : boolean
 >true : true
 >y : derived
 >new derived() : derived
 >derived : typeof derived
 >{ x: false, y: new base() } : { x: false; y: base; }
->x : false
+>x : boolean
 >false : false
 >y : base
 >new base() : base
diff --git a/tests/baselines/reference/arrayBestCommonTypes.types.orig b/tests/baselines/reference/arrayBestCommonTypes.types.orig
diff --git a/tests/baselines/reference/stringLiteralTypesOverloads01.js b/tests/baselines/reference/stringLiteralTypesOverloads01.js

Original file line number	Diff line number	Diff line change
`@@ -1152,7 +1152,7 @@ namespace ts {`
`1152`	`1152`	`export function convertToRelativePath(absoluteOrRelativePath: string, basePath: string, getCanonicalFileName: (path: string) => string): string {`
`1153`	`1153`	`return !isRootedDiskPath(absoluteOrRelativePath)`
`1154`	`1154`	`? absoluteOrRelativePath`
`1155`		`- : getRelativePathToDirectoryOrUrl(basePath, absoluteOrRelativePath, basePath, getCanonicalFileName, /* isAbsolutePathAnUrl */ false);`
	`1155`	`+ : getRelativePathToDirectoryOrUrl(basePath, absoluteOrRelativePath, basePath, getCanonicalFileName, /isAbsolutePathAnUrl/ false);`
`1156`	`1156`	`}`
`1157`	`1157`
`1158`	`1158`	`function normalizedPathComponents(path: string, rootLength: number) {`