Consolidate normalizing slashes and use it from typescript core.ts

Author: sheetalkamat

src/harness/fourslashRunner.ts

@@ -20,7 +20,7 @@ class FourslashRunner extends RunnerBase {
  });
 
  this.tests.forEach((fn: string) => {
- fn = Harness.Path.switchToForwardSlashes(fn);
+ fn = ts.normalizeSlashes(fn);
  var justName = fn.replace(/^.*[\\\/]/, '');
 
  // Convert to relative path

src/harness/harness.ts

@@ -117,15 +117,11 @@ module Harness.Path {
  }
 
  export function filePath(fullPath: string) {
- fullPath = switchToForwardSlashes(fullPath);
+ fullPath = ts.normalizeSlashes(fullPath);
  var components = fullPath.split("/");
  var path: string[] = components.slice(0, components.length - 1);
  return path.join("/") + "/";
  }
-
- export function switchToForwardSlashes(path: string) {
- return path.replace(/\\/g, "/").replace(/\/\//g, '/');
- }
 }
 
 module Harness {
@@ -564,7 +560,7 @@ module Harness {
  // Register input files
  function register(file: { unitName: string; content: string; }) {
  if (file.content !== undefined) {
- var filename = Path.switchToForwardSlashes(file.unitName);
+ var filename = ts.normalizeSlashes(file.unitName);
  filemap[getCanonicalFileName(filename)] = ts.createSourceFile(filename, file.content, scriptTarget, /*version:*/ "0");
  }
  };
@@ -782,7 +778,7 @@ module Harness {
  var filemap: { [name: string]: ts.SourceFile; } = {};
  var register = (file: { unitName: string; content: string; }) => {
  if (file.content !== undefined) {
- var filename = Path.switchToForwardSlashes(file.unitName);
+ var filename = ts.normalizeSlashes(file.unitName);
  filemap[getCanonicalFileName(filename)] = ts.createSourceFile(filename, file.content, options.target, /*version:*/ "0");
  }
  };

src/harness/loggedIO.ts

@@ -175,10 +175,10 @@ module Playback {
  }
 
  function findResultByPath<T>(wrapper: { resolvePath(s: string): string }, logArray: { path: string; result?: T }[], expectedPath: string, defaultValue?: T): T {
- var normalizedName = Harness.Path.switchToForwardSlashes(expectedPath).toLowerCase();
+ var normalizedName = ts.normalizeSlashes(expectedPath).toLowerCase();
  // Try to find the result through normal filename
  for (var i = 0; i < logArray.length; i++) {
- if (Harness.Path.switchToForwardSlashes(logArray[i].path).toLowerCase() === normalizedName) {
+ if (ts.normalizeSlashes(logArray[i].path).toLowerCase() === normalizedName) {
  return logArray[i].result;
  }
  }
@@ -203,7 +203,7 @@ module Playback {
  function pathsAreEquivalent(left: string, right: string, wrapper: { resolvePath(s: string): string }) {
  var key = left + '-~~-' + right;
  function areSame(a: string, b: string) {
- return Harness.Path.switchToForwardSlashes(a).toLowerCase() === Harness.Path.switchToForwardSlashes(b).toLowerCase();
+ return ts.normalizeSlashes(a).toLowerCase() === ts.normalizeSlashes(b).toLowerCase();
  }
  function check() {
  if (Harness.Path.getFileName(left).toLowerCase() === Harness.Path.getFileName(right).toLowerCase()) {

src/harness/rwcRunner.ts

@@ -23,7 +23,7 @@ module RWC {
  function collateOutputs(outputFiles: Harness.Compiler.GeneratedFile[], clean?: (s: string) => string) {
  // Collect, test, and sort the filenames
  function cleanName(fn: string) {
- var lastSlash = Harness.Path.switchToForwardSlashes(fn).lastIndexOf('/');
+ var lastSlash = ts.normalizeSlashes(fn).lastIndexOf('/');
  return fn.substr(lastSlash + 1).toLowerCase();
  }
  outputFiles.sort((a, b) => cleanName(a.fileName).localeCompare(cleanName(b.fileName)));
@@ -52,7 +52,7 @@ module RWC {
  var compilerResult: Harness.Compiler.CompilerResult;
  var compilerOptions: ts.CompilerOptions;
  var baselineOpts: Harness.Baseline.BaselineOptions = { Subfolder: 'rwc' };
- var baseName = /(.*)\/(.*).json/.exec(Harness.Path.switchToForwardSlashes(jsonPath))[2];
+ var baseName = /(.*)\/(.*).json/.exec(ts.normalizeSlashes(jsonPath))[2];
  // Compile .d.ts files
  var declFileCompilationResult: {
  declInputFiles: { unitName: string; content: string }[];
@@ -99,7 +99,7 @@ module RWC {
  }
 
  ts.forEach(ioLog.filesRead, fileRead => {
- var resolvedPath = Harness.Path.switchToForwardSlashes(sys.resolvePath(fileRead.path));
+ var resolvedPath = ts.normalizeSlashes(sys.resolvePath(fileRead.path));
  var inInputList = ts.forEach(inputFiles, inputFile=> inputFile.unitName === resolvedPath);
  if (!inInputList) {
  // Add the file to other files
@@ -117,7 +117,7 @@ module RWC {
  });
 
  function getHarnessCompilerInputUnit(fileName: string) {
- var resolvedPath = Harness.Path.switchToForwardSlashes(sys.resolvePath(fileName));
+ var resolvedPath = ts.normalizeSlashes(sys.resolvePath(fileName));
  try {
  var content = sys.readFile(resolvedPath);
  }