Combine repeatString helper functions (microsoft#21235)

Andy · web-flow · commit e248d08e4c7b · 2018-01-17T12:43:41.000-08:00
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -1535,8 +1535,8 @@ Actual: ${stringify(fullActual)}`);
             const addSpanInfoString = () => {
                 if (previousSpanInfo) {
                     resultString += currentLine;
-                    let thisLineMarker = repeatString(startColumn, " ") + repeatString(length, "~");
-                    thisLineMarker += repeatString(this.alignmentForExtraInfo - thisLineMarker.length - prefixString.length + 1, " ");
+                    let thisLineMarker = ts.repeatString(" ", startColumn) + ts.repeatString("~", length);
+                    thisLineMarker += ts.repeatString(" ", this.alignmentForExtraInfo - thisLineMarker.length - prefixString.length + 1);
                     resultString += thisLineMarker;
                     resultString += "=> Pos: (" + (pos - length) + " to " + (pos - 1) + ") ";
                     resultString += " " + previousSpanInfo;
@@ -1551,7 +1551,7 @@ Actual: ${stringify(fullActual)}`);
                     if (resultString.length) {
                         resultString += "\n--------------------------------";
                     }
-                    currentLine = "\n" + nextLine.toString() + repeatString(3 - nextLine.toString().length, " ") + ">" + this.activeFile.content.substring(pos, fileLineMap[nextLine]) + "\n    ";
+                    currentLine = "\n" + nextLine.toString() + ts.repeatString(" ", 3 - nextLine.toString().length) + ">" + this.activeFile.content.substring(pos, fileLineMap[nextLine]) + "\n    ";
                     startColumn = 0;
                     length = 0;
                 }
@@ -2787,7 +2787,7 @@ Actual: ${stringify(fullActual)}`);
             const items = this.languageService.getNavigationBarItems(this.activeFile.fileName);
             Harness.IO.log(`Navigation bar (${items.length} items)`);
             for (const item of items) {
-                Harness.IO.log(`${repeatString(item.indent, " ")}name: ${item.text}, kind: ${item.kind}, childItems: ${item.childItems.map(child => child.text)}`);
+                Harness.IO.log(`${ts.repeatString(" ", item.indent)}name: ${item.text}, kind: ${item.kind}, childItems: ${item.childItems.map(child => child.text)}`);
             }
         }
 
@@ -3689,14 +3689,6 @@ ${code}
         };
     }
 
-    function repeatString(count: number, char: string) {
-        let result = "";
-        for (let i = 0; i < count; i++) {
-            result += char;
-        }
-        return result;
-    }
-
     function stringify(data: any, replacer?: (key: string, value: any) => any): string {
         return JSON.stringify(data, replacer, 2);
     }
diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts
@@ -1277,13 +1277,13 @@ namespace ts.formatting {
             }
 
             if (internedTabsIndentation[tabs] === undefined) {
-                internedTabsIndentation[tabs] = tabString = repeat("\t", tabs);
+                internedTabsIndentation[tabs] = tabString = repeatString("\t", tabs);
             }
             else {
                 tabString = internedTabsIndentation[tabs];
             }
 
-            return spaces ? tabString + repeat(" ", spaces) : tabString;
+            return spaces ? tabString + repeatString(" ", spaces) : tabString;
         }
         else {
             let spacesString: string;
@@ -1294,23 +1294,14 @@ namespace ts.formatting {
             }
 
             if (internedSpacesIndentation[quotient] === undefined) {
-                spacesString = repeat(" ", options.indentSize * quotient);
+                spacesString = repeatString(" ", options.indentSize * quotient);
                 internedSpacesIndentation[quotient] = spacesString;
             }
             else {
                 spacesString = internedSpacesIndentation[quotient];
             }
 
-            return remainder ? spacesString + repeat(" ", remainder) : spacesString;
-        }
-
-        function repeat(value: string, count: number): string {
-            let s = "";
-            for (let i = 0; i < count; i++) {
-                s += value;
-            }
-
-            return s;
+            return remainder ? spacesString + repeatString(" ", remainder) : spacesString;
         }
     }
 }
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
@@ -1110,6 +1110,14 @@ namespace ts {
     export function getSnapshotText(snap: IScriptSnapshot): string {
         return snap.getText(0, snap.getLength());
     }
+
+    export function repeatString(str: string, count: number): string {
+        let result = "";
+        for (let i = 0; i < count; i++) {
+            result += str;
+        }
+        return result;
+    }
 }
 
 // Display-part writer helpers

Original file line number	Diff line number	Diff line change
`@@ -1277,13 +1277,13 @@ namespace ts.formatting {`
`1277`	`1277`	`}`
`1278`	`1278`
`1279`	`1279`	`if (internedTabsIndentation[tabs] === undefined) {`
`1280`		`- internedTabsIndentation[tabs] = tabString = repeat("\t", tabs);`
	`1280`	`+ internedTabsIndentation[tabs] = tabString = repeatString("\t", tabs);`
`1281`	`1281`	`}`
`1282`	`1282`	`else {`
`1283`	`1283`	`tabString = internedTabsIndentation[tabs];`
`1284`	`1284`	`}`
`1285`	`1285`
`1286`		`- return spaces ? tabString + repeat(" ", spaces) : tabString;`
	`1286`	`+ return spaces ? tabString + repeatString(" ", spaces) : tabString;`
`1287`	`1287`	`}`
`1288`	`1288`	`else {`
`1289`	`1289`	`let spacesString: string;`
`@@ -1294,23 +1294,14 @@ namespace ts.formatting {`
`1294`	`1294`	`}`
`1295`	`1295`
`1296`	`1296`	`if (internedSpacesIndentation[quotient] === undefined) {`
`1297`		`- spacesString = repeat(" ", options.indentSize * quotient);`
	`1297`	`+ spacesString = repeatString(" ", options.indentSize * quotient);`
`1298`	`1298`	`internedSpacesIndentation[quotient] = spacesString;`
`1299`	`1299`	`}`
`1300`	`1300`	`else {`
`1301`	`1301`	`spacesString = internedSpacesIndentation[quotient];`
`1302`	`1302`	`}`
`1303`	`1303`
`1304`		`- return remainder ? spacesString + repeat(" ", remainder) : spacesString;`
`1305`		`- }`
`1306`		`-`
`1307`		`- function repeat(value: string, count: number): string {`
`1308`		`- let s = "";`
`1309`		`- for (let i = 0; i < count; i++) {`
`1310`		`- s += value;`
`1311`		`- }`
`1312`		`-`
`1313`		`- return s;`
	`1304`	`+ return remainder ? spacesString + repeatString(" ", remainder) : spacesString;`
`1314`	`1305`	`}`
`1315`	`1306`	`}`
`1316`	`1307`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1110,6 +1110,14 @@ namespace ts {`
`1110`	`1110`	`export function getSnapshotText(snap: IScriptSnapshot): string {`
`1111`	`1111`	`return snap.getText(0, snap.getLength());`
`1112`	`1112`	`}`
	`1113`	`+`
	`1114`	`+ export function repeatString(str: string, count: number): string {`
	`1115`	`+ let result = "";`
	`1116`	`+ for (let i = 0; i < count; i++) {`
	`1117`	`+ result += str;`
	`1118`	`+ }`
	`1119`	`+ return result;`
	`1120`	`+ }`
`1113`	`1121`	`}`
`1114`	`1122`
`1115`	`1123`	`// Display-part writer helpers`