Use 'let' in the services layer.

CyrusNajmabadi · CyrusNajmabadi · commit b1996918430d · 2015-03-13T14:25:50.000-07:00
diff --git a/src/services/formatting/formattingScanner.ts b/src/services/formatting/formattingScanner.ts
@@ -2,7 +2,7 @@
 /// <reference path="..\..\compiler\scanner.ts"/>
 
 module ts.formatting {
-    var scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false);
+    let scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false);
 
     export interface FormattingScanner {
         advance(): void;
@@ -24,13 +24,13 @@ module ts.formatting {
         scanner.setText(sourceFile.text);
         scanner.setTextPos(startPos);
 
-        var wasNewLine: boolean = true;
-        var leadingTrivia: TextRangeWithKind[];
-        var trailingTrivia: TextRangeWithKind[];
+        let wasNewLine: boolean = true;
+        let leadingTrivia: TextRangeWithKind[];
+        let trailingTrivia: TextRangeWithKind[];
         
-        var savedPos: number;
-        var lastScanAction: ScanAction;
-        var lastTokenInfo: TokenInfo;
+        let savedPos: number;
+        let lastScanAction: ScanAction;
+        let lastTokenInfo: TokenInfo;
 
         return {
             advance: advance,
@@ -45,7 +45,7 @@ module ts.formatting {
 
         function advance(): void {
             lastTokenInfo = undefined;
-            var isStarted = scanner.getStartPos() !== startPos;
+            let isStarted = scanner.getStartPos() !== startPos;
 
             if (isStarted) {
                 if (trailingTrivia) {
@@ -64,19 +64,19 @@ module ts.formatting {
                 scanner.scan();
             }
 
-            var t: SyntaxKind;
-            var pos = scanner.getStartPos();
+            let t: SyntaxKind;
+            let pos = scanner.getStartPos();
             
             // Read leading trivia and token
             while (pos < endPos) {
-                var t = scanner.getToken();
+                let t = scanner.getToken();
                 if (!isTrivia(t)) {
                     break;
                 }
 
                 // consume leading trivia
                 scanner.scan();
-                var item = {
+                let item = {
                     pos: pos,
                     end: scanner.getStartPos(),
                     kind: t
@@ -133,7 +133,7 @@ module ts.formatting {
 
             // normally scanner returns the smallest available token
             // check the kind of context node to determine if scanner should have more greedy behavior and consume more text.
-            var expectedScanAction = 
+            let expectedScanAction = 
                 shouldRescanGreaterThanToken(n)
                 ? ScanAction.RescanGreaterThanToken
                 : shouldRescanSlashToken(n) 
@@ -159,7 +159,7 @@ module ts.formatting {
                 scanner.scan();
             }
 
-            var currentToken = scanner.getToken();
+            let currentToken = scanner.getToken();
 
             if (expectedScanAction === ScanAction.RescanGreaterThanToken && currentToken === SyntaxKind.GreaterThanToken) {
                 currentToken = scanner.reScanGreaterToken();
@@ -179,7 +179,7 @@ module ts.formatting {
                 lastScanAction = ScanAction.Scan;
             }
 
-            var token: TextRangeWithKind = {
+            let token: TextRangeWithKind = {
                 pos: scanner.getStartPos(),
                 end: scanner.getTextPos(),
                 kind: currentToken
@@ -194,7 +194,7 @@ module ts.formatting {
                 if (!isTrivia(currentToken)) {
                     break;
                 }
-                var trivia = {
+                let trivia = {
                     pos: scanner.getStartPos(),
                     end: scanner.getTextPos(),
                     kind: currentToken
@@ -223,8 +223,8 @@ module ts.formatting {
         }
 
         function isOnToken(): boolean {
-            var current = (lastTokenInfo && lastTokenInfo.token.kind) ||  scanner.getToken();
-            var startPos = (lastTokenInfo && lastTokenInfo.token.pos) || scanner.getStartPos();
+            let current = (lastTokenInfo && lastTokenInfo.token.kind) ||  scanner.getToken();
+            let startPos = (lastTokenInfo && lastTokenInfo.token.pos) || scanner.getStartPos();
             return startPos < endPos && current !== SyntaxKind.EndOfFileToken && !isTrivia(current);
         }
 
