remove fixCaretPosition

aozgaa · aozgaa · commit 2857bb9703ca · 2017-07-05T12:47:32.000-07:00
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -1652,7 +1652,6 @@ namespace FourSlash {
                 }
             }
 
-            this.fixCaretPosition();
             this.checkPostEditInvariants();
         }
 
@@ -1678,7 +1677,6 @@ namespace FourSlash {
                 // Don't need to examine formatting because there are no formatting changes on backspace.
             }
 
-            this.fixCaretPosition();
             this.checkPostEditInvariants();
         }
 
@@ -1722,7 +1720,6 @@ namespace FourSlash {
                 }
             }
 
-            this.fixCaretPosition();
             this.checkPostEditInvariants();
         }
 
@@ -1741,7 +1738,6 @@ namespace FourSlash {
                 }
             }
 
-            this.fixCaretPosition();
 
             this.checkPostEditInvariants();
         }
@@ -1769,17 +1765,6 @@ namespace FourSlash {
             Utils.assertStructuralEquals(incrementalSourceFile, referenceSourceFile);
         }
 
-        private fixCaretPosition() {
-            // The caret can potentially end up between the \r and \n, which is confusing. If
-            // that happens, move it back one character
-            if (this.currentCaretPosition > 0) {
-                const ch = this.getFileContent(this.activeFile.fileName).substring(this.currentCaretPosition - 1, this.currentCaretPosition);
-                if (ch === "\r") {
-                    this.currentCaretPosition--;
-                }
-            }
-        }
-
         /**
          * @returns The number of characters added to the file as a result of the edits.
          * May be negative.
@@ -1836,19 +1821,16 @@ namespace FourSlash {
         public formatDocument() {
             const edits = this.languageService.getFormattingEditsForDocument(this.activeFile.fileName, this.formatCodeSettings);
             this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true);
-            this.fixCaretPosition();
         }
 
         public formatSelection(start: number, end: number) {
             const edits = this.languageService.getFormattingEditsForRange(this.activeFile.fileName, start, end, this.formatCodeSettings);
             this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true);
-            this.fixCaretPosition();
         }
 
         public formatOnType(pos: number, key: string) {
             const edits = this.languageService.getFormattingEditsAfterKeystroke(this.activeFile.fileName, pos, key, this.formatCodeSettings);
             this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true);
-            this.fixCaretPosition();
         }
 
         private editScriptAndUpdateMarkers(fileName: string, editStart: number, editEnd: number, newText: string) {

Original file line number	Diff line number	Diff line change
`@@ -1652,7 +1652,6 @@ namespace FourSlash {`
`1652`	`1652`	`}`
`1653`	`1653`	`}`
`1654`	`1654`
`1655`		`- this.fixCaretPosition();`
`1656`	`1655`	`this.checkPostEditInvariants();`
`1657`	`1656`	`}`
`1658`	`1657`
`@@ -1678,7 +1677,6 @@ namespace FourSlash {`
`1678`	`1677`	`// Don't need to examine formatting because there are no formatting changes on backspace.`
`1679`	`1678`	`}`
`1680`	`1679`
`1681`		`- this.fixCaretPosition();`
`1682`	`1680`	`this.checkPostEditInvariants();`
`1683`	`1681`	`}`
`1684`	`1682`
`@@ -1722,7 +1720,6 @@ namespace FourSlash {`
`1722`	`1720`	`}`
`1723`	`1721`	`}`
`1724`	`1722`
`1725`		`- this.fixCaretPosition();`
`1726`	`1723`	`this.checkPostEditInvariants();`
`1727`	`1724`	`}`
`1728`	`1725`
`@@ -1741,7 +1738,6 @@ namespace FourSlash {`
`1741`	`1738`	`}`
`1742`	`1739`	`}`
`1743`	`1740`
`1744`		`- this.fixCaretPosition();`
`1745`	`1741`
`1746`	`1742`	`this.checkPostEditInvariants();`
`1747`	`1743`	`}`
`@@ -1769,17 +1765,6 @@ namespace FourSlash {`
`1769`	`1765`	`Utils.assertStructuralEquals(incrementalSourceFile, referenceSourceFile);`
`1770`	`1766`	`}`
`1771`	`1767`
`1772`		`- private fixCaretPosition() {`
`1773`		`- // The caret can potentially end up between the \r and \n, which is confusing. If`
`1774`		`- // that happens, move it back one character`
`1775`		`- if (this.currentCaretPosition > 0) {`
`1776`		`- const ch = this.getFileContent(this.activeFile.fileName).substring(this.currentCaretPosition - 1, this.currentCaretPosition);`
`1777`		`- if (ch === "\r") {`
`1778`		`- this.currentCaretPosition--;`
`1779`		`- }`
`1780`		`- }`
`1781`		`- }`
`1782`		`-`
`1783`	`1768`	`/**`
`1784`	`1769`	`* @returns The number of characters added to the file as a result of the edits.`
`1785`	`1770`	`* May be negative.`
`@@ -1836,19 +1821,16 @@ namespace FourSlash {`
`1836`	`1821`	`public formatDocument() {`
`1837`	`1822`	`const edits = this.languageService.getFormattingEditsForDocument(this.activeFile.fileName, this.formatCodeSettings);`
`1838`	`1823`	`this.applyEdits(this.activeFile.fileName, edits, /isFormattingEdit/ true);`
`1839`		`- this.fixCaretPosition();`
`1840`	`1824`	`}`
`1841`	`1825`
`1842`	`1826`	`public formatSelection(start: number, end: number) {`
`1843`	`1827`	`const edits = this.languageService.getFormattingEditsForRange(this.activeFile.fileName, start, end, this.formatCodeSettings);`
`1844`	`1828`	`this.applyEdits(this.activeFile.fileName, edits, /isFormattingEdit/ true);`
`1845`		`- this.fixCaretPosition();`
`1846`	`1829`	`}`
`1847`	`1830`
`1848`	`1831`	`public formatOnType(pos: number, key: string) {`
`1849`	`1832`	`const edits = this.languageService.getFormattingEditsAfterKeystroke(this.activeFile.fileName, pos, key, this.formatCodeSettings);`
`1850`	`1833`	`this.applyEdits(this.activeFile.fileName, edits, /isFormattingEdit/ true);`
`1851`		`- this.fixCaretPosition();`
`1852`	`1834`	`}`
`1853`	`1835`
`1854`	`1836`	`private editScriptAndUpdateMarkers(fileName: string, editStart: number, editEnd: number, newText: string) {`