Added logic to handle requests for changes past the end of the buffer.

steveluc · steveluc · commit f9fd36521548 · 2015-03-02T16:31:51.000-08:00
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -1259,7 +1259,7 @@ module ts.server {
 
         getText(rangeStart: number, rangeLength: number) {
             var accum = "";
-            if (rangeLength > 0) {
+            if ((rangeLength > 0) && (rangeStart < this.root.charCount())) {
                 this.walk(rangeStart, rangeLength, {
                     goSubtree: true,
                     done: false,
@@ -1322,14 +1322,14 @@ module ts.server {
                 }
                 else if (pos >= this.root.charCount()) {
                     // insert at end
-                    var endString = this.getText(pos - 1, 1);
+                    pos = this.root.charCount() - 1;
+                    var endString = this.getText(pos, 1);
                     if (newText) {
                         newText = endString + newText;
                     }
                     else {
                         newText = endString;
                     }
-                    pos = pos - 1;
                     deleteLength = 0;
                     walker.suppressTrailingText = true;
                 }

Original file line number	Diff line number	Diff line change
`@@ -1259,7 +1259,7 @@ module ts.server {`
`1259`	`1259`
`1260`	`1260`	`getText(rangeStart: number, rangeLength: number) {`
`1261`	`1261`	`var accum = "";`
`1262`		`- if (rangeLength > 0) {`
	`1262`	`+ if ((rangeLength > 0) && (rangeStart < this.root.charCount())) {`
`1263`	`1263`	`this.walk(rangeStart, rangeLength, {`
`1264`	`1264`	`goSubtree: true,`
`1265`	`1265`	`done: false,`
`@@ -1322,14 +1322,14 @@ module ts.server {`
`1322`	`1322`	`}`
`1323`	`1323`	`else if (pos >= this.root.charCount()) {`
`1324`	`1324`	`// insert at end`
`1325`		`- var endString = this.getText(pos - 1, 1);`
	`1325`	`+ pos = this.root.charCount() - 1;`
	`1326`	`+ var endString = this.getText(pos, 1);`
`1326`	`1327`	`if (newText) {`
`1327`	`1328`	`newText = endString + newText;`
`1328`	`1329`	`}`
`1329`	`1330`	`else {`
`1330`	`1331`	`newText = endString;`
`1331`	`1332`	`}`
`1332`		`- pos = pos - 1;`
`1333`	`1333`	`deleteLength = 0;`
`1334`	`1334`	`walker.suppressTrailingText = true;`
`1335`	`1335`	`}`