Merge branch 'master' into templates

Author: DanielRosenwasser

CONTRIBUTING.md

@@ -26,6 +26,7 @@ Your pull request should:
     * Include baseline changes with your change
     * All changed code must have 100% code coverage
 * Follow the code conventions descriped in [Coding guidlines](https://github.com/Microsoft/TypeScript/wiki/Coding-guidlines)
+* To avoid line ending issues, set `autocrlf = input` and `whitespace = cr-at-eol` in your git configuration
 
 ## Running the Tests
 To run all tests, invoke the runtests target using jake:

Jakefile

@@ -55,6 +55,7 @@ var servicesSources = [
 ].map(function (f) {
     return path.join(compilerDirectory, f);
 }).concat([
+    "breakpoints.ts",
     "services.ts",
     "shims.ts",
     "signatureHelp.ts",

bin/tsc.js

@@ -4083,22 +4083,22 @@ module ts {
         }
 
         function parseSourceElement() {
-            return parseSourceElementOrModuleElement(ModifierContext.SourceElements, /*allowLetAndConstDeclarations*/ false);
+            return parseSourceElementOrModuleElement(ModifierContext.SourceElements);
         }
 
         function parseModuleElement() {
-            return parseSourceElementOrModuleElement(ModifierContext.ModuleElements, /*allowLetAndConstDeclarations*/ true);
+            return parseSourceElementOrModuleElement(ModifierContext.ModuleElements);
         }
 
-        function parseSourceElementOrModuleElement(modifierContext: ModifierContext, allowLetAndConstDeclarations: boolean): Statement {
+        function parseSourceElementOrModuleElement(modifierContext: ModifierContext): Statement {
             if (isDeclaration()) {
                 return parseDeclaration(modifierContext);
             }
 
             var statementStart = scanner.getTokenPos();
             var statementFirstTokenLength = scanner.getTextPos() - statementStart;
             var errorCountBeforeStatement = file.syntacticErrors.length;
-            var statement = parseStatement(allowLetAndConstDeclarations);
+            var statement = parseStatement(/*allowLetAndConstDeclarations*/ true);
 
             if (inAmbientContext && file.syntacticErrors.length === errorCountBeforeStatement) {
                 grammarErrorAtPos(statementStart, statementFirstTokenLength, Diagnostics.Statements_are_not_allowed_in_ambient_contexts);

bin/typescriptServices.js

@@ -985,15 +985,85 @@ module FourSlash {
             return item.parameters[currentParam];
         }
 
-        public getBreakpointStatementLocation(pos: number) {
-            this.taoInvalidReason = 'getBreakpointStatementLocation NYI';
+        private alignmentForExtraInfo = 50;
+
+        private spanInfoToString(pos: number, spanInfo: TypeScript.TextSpan, prefixString: string) {
+            var resultString = "SpanInfo: " + JSON.stringify(spanInfo);
+            if (spanInfo) {
+                var spanString = this.activeFile.content.substr(spanInfo.start(), spanInfo.length());
+                var spanLineMap = ts.getLineStarts(spanString);
+                for (var i = 0; i < spanLineMap.length; i++) {
+                    if (!i) {
+                        resultString += "\n";
+                    }
+                    resultString += prefixString + spanString.substring(spanLineMap[i], spanLineMap[i + 1]);
+                }
+                resultString += "\n" + prefixString + ":=> (" + this.getLineColStringAtPosition(spanInfo.start()) + ") to (" + this.getLineColStringAtPosition(spanInfo.end()) + ")";
+            }
+
+            return resultString;
+        }
+
+        private baselineCurrentFileLocations(getSpanAtPos: (pos: number) => TypeScript.TextSpan): string {
+            var fileLineMap = ts.getLineStarts(this.activeFile.content);
+            var nextLine = 0;
+            var resultString = "";
+            var currentLine: string;
+            var previousSpanInfo: string;
+            var startColumn: number;
+            var length: number;
+            var prefixString = "    >";
+
+            var addSpanInfoString = () => {
+                if (previousSpanInfo) {
+                    resultString += currentLine;
+                    var thisLineMarker = repeatString(startColumn, " ") + repeatString(length, "~");
+                    thisLineMarker += repeatString(this.alignmentForExtraInfo - thisLineMarker.length - prefixString.length + 1, " ");
+                    resultString += thisLineMarker;
+                    resultString += "=> Pos: (" + (pos - length) + " to " + (pos - 1) + ") ";
+                    resultString += " " + previousSpanInfo;
+                    previousSpanInfo = undefined;
+                }
+            };
 
-            var spanInfo = this.languageService.getBreakpointStatementAtPosition(this.activeFile.fileName, pos);
-            var resultString = "\n**Pos: " + pos + " SpanInfo: " + JSON.stringify(spanInfo) + "\n** Statement: ";
-            if (spanInfo !== null) {
-                resultString = resultString + this.activeFile.content.substr(spanInfo.start(), spanInfo.length());
+            for (var pos = 0; pos < this.activeFile.content.length; pos++) {
+                if (pos === 0 || pos === fileLineMap[nextLine]) {
+                    nextLine++;
+                    addSpanInfoString();
+                    if (resultString.length) {
+                        resultString += "\n--------------------------------";
+                    }
+                    currentLine = "\n" + nextLine.toString() + repeatString(3 - nextLine.toString().length, " ") + ">" + this.activeFile.content.substring(pos, fileLineMap[nextLine]) + "\n    ";
+                    startColumn = 0;
+                    length = 0;
+                }
+                var spanInfo = this.spanInfoToString(pos, getSpanAtPos(pos), prefixString);
+                if (previousSpanInfo && previousSpanInfo !== spanInfo) {
+                    addSpanInfoString();
+                    previousSpanInfo = spanInfo;
+                    startColumn = startColumn + length;
+                    length = 1;
+                }
+                else {
+                    previousSpanInfo = spanInfo;
+                    length++;
+                }
             }
+            addSpanInfoString();
             return resultString;
+
+            function repeatString(count: number, char: string) {
+                var result = "";
+                for (var i = 0; i < count; i++) {
+                    result += char;
+                }
+                return result;
+            }
+        }
+
+        public getBreakpointStatementLocation(pos: number) {
+            this.taoInvalidReason = 'getBreakpointStatementLocation NYI';
+            return this.languageService.getBreakpointStatementAtPosition(this.activeFile.fileName, pos);
         }
 
         public baselineCurrentFileBreakpointLocations() {
@@ -1003,12 +1073,7 @@ module FourSlash {
                 "Breakpoint Locations for " + this.activeFile.fileName,
                 this.testData.globalOptions[testOptMetadataNames.baselineFile],
                 () => {
-                    var fileLength = this.languageServiceShimHost.getScriptSnapshot(this.activeFile.fileName).getLength();
-                    var resultString = "";
-                    for (var pos = 0; pos < fileLength; pos++) {
-                        resultString = resultString + this.getBreakpointStatementLocation(pos);
-                    }
-                    return resultString;
+                    return this.baselineCurrentFileLocations(pos => this.getBreakpointStatementLocation(pos));
                 },
                 true /* run immediately */);
         }
@@ -1056,7 +1121,7 @@ module FourSlash {
         }
 
         public printBreakpointLocation(pos: number) {
-            Harness.IO.log(this.getBreakpointStatementLocation(pos));
+            Harness.IO.log("\n**Pos: " + pos + " " + this.spanInfoToString(pos, this.getBreakpointStatementLocation(pos), "  "));
         }
 
         public printBreakpointAtCurrentLocation() {
@@ -1502,7 +1567,7 @@ module FourSlash {
                 throw new Error('verifyCaretAtMarker failed - expected to be in file "' + pos.fileName + '", but was in file "' + this.activeFile.fileName + '"');
             }
             if (pos.position !== this.currentCaretPosition) {
-                throw new Error('verifyCaretAtMarker failed - expected to be at marker "/*' + markerName + '*/, but was at position ' + this.currentCaretPosition + '(' + this.getLineColStringAtCaret() + ')');
+                throw new Error('verifyCaretAtMarker failed - expected to be at marker "/*' + markerName + '*/, but was at position ' + this.currentCaretPosition + '(' + this.getLineColStringAtPosition(this.currentCaretPosition) + ')');
             }
         }
 
@@ -1566,10 +1631,10 @@ module FourSlash {
             this.taoInvalidReason = 'verifyCurrentNameOrDottedNameSpanText NYI';
 
             var span = this.languageService.getNameOrDottedNameSpan(this.activeFile.fileName, this.currentCaretPosition, this.currentCaretPosition);
-            if (span === null) {
+            if (!span) {
                 this.raiseError('verifyCurrentNameOrDottedNameSpanText\n' +
                     '\tExpected: "' + text + '"\n' +
-                    '\t  Actual: null');
+                    '\t  Actual: undefined');
             }
 
             var actual = this.languageServiceShimHost.getScriptSnapshot(this.activeFile.fileName).getText(span.start(), span.end());
@@ -1581,12 +1646,8 @@ module FourSlash {
         }
 
         private getNameOrDottedNameSpan(pos: number) {
-            var spanInfo = this.languageService.getNameOrDottedNameSpan(this.activeFile.fileName, pos, pos);
-            var resultString = "\n**Pos: " + pos + " SpanInfo: " + JSON.stringify(spanInfo) + "\n** Statement: ";
-            if (spanInfo !== null) {
-                resultString = resultString + this.languageServiceShimHost.getScriptSnapshot(this.activeFile.fileName).getText(spanInfo.start(), spanInfo.end());
-            }
-            return resultString;
+            this.taoInvalidReason = 'getNameOrDottedNameSpan NYI';
+            return this.languageService.getNameOrDottedNameSpan(this.activeFile.fileName, pos, pos);
         }
 
         public baselineCurrentFileNameOrDottedNameSpans() {
@@ -1596,18 +1657,14 @@ module FourSlash {
                 "Name OrDottedNameSpans for " + this.activeFile.fileName,
                 this.testData.globalOptions[testOptMetadataNames.baselineFile],
                 () => {
-                    var fileLength = this.languageServiceShimHost.getScriptSnapshot(this.activeFile.fileName).getLength();
-                    var resultString = "";
-                    for (var pos = 0; pos < fileLength; pos++) {
-                        resultString = resultString + this.getNameOrDottedNameSpan(pos);
-                    }
-                    return resultString;
+                    return this.baselineCurrentFileLocations(pos =>
+                        this.getNameOrDottedNameSpan(pos));
                 },
                 true /* run immediately */);
         }
 
         public printNameOrDottedNameSpans(pos: number) {
-            Harness.IO.log(this.getNameOrDottedNameSpan(pos));
+            Harness.IO.log(this.spanInfoToString(pos, this.getNameOrDottedNameSpan(pos), "**"));
         }
 
         private verifyClassifications(expected: { classificationType: string; text: string; textSpan?: TextSpan }[], actual: ts.ClassifiedSpan[]) {
@@ -2114,8 +2171,8 @@ module FourSlash {
             return this.languageServiceShimHost.positionToZeroBasedLineCol(this.activeFile.fileName, this.currentCaretPosition).line + 1;
         }
 
-        private getLineColStringAtCaret() {
-            var pos = this.languageServiceShimHost.positionToZeroBasedLineCol(this.activeFile.fileName, this.currentCaretPosition);
+        private getLineColStringAtPosition(position: number) {
+            var pos = this.languageServiceShimHost.positionToZeroBasedLineCol(this.activeFile.fileName, position);
             return 'line ' + (pos.line + 1) + ', col ' + pos.character;
         }