Stop using one based math in fourslash.

CyrusNajmabadi · CyrusNajmabadi · commit 261c8b5bd3a5 · 2015-02-16T18:23:58.000-08:00
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -2010,39 +2010,31 @@ module FourSlash {
 
         // Get the text of the entire line the caret is currently at
         private getCurrentLineContent() {
-            // The current caret position (in line/col terms)
-            var line = this.getCurrentCaretFilePosition().line;
-            // The line/col of the start of this line
-            var pos = this.languageServiceAdapterHost.lineColToPosition(this.activeFile.fileName, line, 1);
-            // The index of the current file
+            var text = this.getFileContent(this.activeFile.fileName)
 
-            // The text from the start of the line to the end of the file
-            var text = this.getFileContent(this.activeFile.fileName).substring(pos);
+            var pos = this.currentCaretPosition;
+            var startPos = pos, endPos = pos;
 
-            // Truncate to the first newline
-            var newlinePos = text.indexOf('\n');
-            if (newlinePos === -1) {
-                return text;
-            }
-            else {
-                if (text.charAt(newlinePos - 1) === '\r') {
-                    newlinePos--;
+            while (startPos > 0) {
+                var ch = text.charCodeAt(startPos - 1);
+                if (ch === ts.CharacterCodes.carriageReturn || ch === ts.CharacterCodes.lineFeed) {
+                    break;
                 }
-                return text.substr(0, newlinePos);
-            }
-        }
 
-        private getCurrentCaretFilePosition() {
-            var result = this.languageServiceAdapterHost.positionToZeroBasedLineAndCharacter(this.activeFile.fileName, this.currentCaretPosition);
-            if (result.line >= 0) {
-                result.line++;
+                startPos--;
             }
 
-            if (result.character >= 0) {
-                result.character++;
+            while (endPos < text.length) {
+                var ch = text.charCodeAt(endPos);
+
+                if (ch === ts.CharacterCodes.carriageReturn || ch === ts.CharacterCodes.lineFeed) {
+                    break;
+                }
+
+                endPos++;
             }
 
-            return result;
+            return text.substring(startPos, endPos);
         }
 
         private assertItemInCompletionList(items: ts.CompletionEntry[], name: string, text?: string, documentation?: string, kind?: string) {
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
@@ -165,19 +165,6 @@ module Harness.LanguageService {
             throw new Error("No script with name '" + fileName + "'");
         }
 
-        /**
-          * @param line 1 based index
-          * @param col 1 based index
-          */
-        public lineColToPosition(fileName: string, line: number, col: number): number {
-            var script: ScriptInfo = this.fileNameToScript[fileName];
-            assert.isNotNull(script);
-            assert.isTrue(line >= 1);
-            assert.isTrue(col >= 1);
-
-            return ts.computePositionOfOneBasedLineAndCharacter(script.lineMap, line, col);
-        }
-
         /**
           * @param line 0 based index
           * @param col 0 based index
@@ -234,7 +221,6 @@ module Harness.LanguageService {
         addScript(fileName: string, content: string): void { this.nativeHost.addScript(fileName, content); }
         updateScript(fileName: string, content: string): void { return this.nativeHost.updateScript(fileName, content); }
         editScript(fileName: string, minChar: number, limChar: number, newText: string): void { this.nativeHost.editScript(fileName, minChar, limChar, newText); }
-        lineColToPosition(fileName: string, line: number, col: number): number { return this.nativeHost.lineColToPosition(fileName, line, col); }
         positionToZeroBasedLineAndCharacter(fileName: string, position: number): ts.LineAndCharacter { return this.nativeHost.positionToZeroBasedLineAndCharacter(fileName, position); }
 
         getCompilationSettings(): string { return JSON.stringify(this.nativeHost.getCompilationSettings()); }
