update docs and better naming for cursor/selection

rebornix · rebornix · commit 9dbe45da90a5 · 2016-12-13T21:41:41.000-08:00
diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts
@@ -3939,7 +3939,7 @@ export interface ICommonCodeEditor extends IEditor {
 	pushUndoStop(): boolean;
 
 	/**
-	 * Execute a command on the editor.
+	 * Execute edits on the editor.
 	 * @param source The source of the call.
 	 * @param edits The edits to execute.
 	 * @param endCursoState Cursor state after the edits were applied.
diff --git a/src/vs/editor/contrib/linesOperations/common/linesOperations.ts b/src/vs/editor/contrib/linesOperations/common/linesOperations.ts
@@ -518,16 +518,16 @@ export class JoinLinesAction extends EditorAction {
 
 	public run(accessor: ServicesAccessor, editor: ICommonCodeEditor): void {
 		let selections = editor.getSelections();
-		let primarySelection = editor.getSelection();
+		let primaryCursor = editor.getSelection();
 
 		selections.sort(Range.compareRangesUsingStarts);
 		let reducedSelections: Selection[] = [];
 
 		let lastSelection = selections.reduce((previousValue, currentValue) => {
 			if (previousValue.isEmpty()) {
 				if (previousValue.endLineNumber === currentValue.startLineNumber) {
-					if (primarySelection.equalsSelection(previousValue)) {
-						primarySelection = currentValue;
+					if (primaryCursor.equalsSelection(previousValue)) {
+						primaryCursor = currentValue;
 					}
 					return currentValue;
 				}
@@ -553,7 +553,7 @@ export class JoinLinesAction extends EditorAction {
 		let model = editor.getModel();
 		let edits = [];
 		let endCursorState = [];
-		let resultPrimarySelection = primarySelection;
+		let endPrimaryCursor = primaryCursor;
 		let lineOffset = 0;
 
 		for (let i = 0, len = reducedSelections.length; i < len; i++) {
@@ -632,8 +632,8 @@ export class JoinLinesAction extends EditorAction {
 					}
 				}
 
-				if (Range.intersectRanges(deleteSelection, primarySelection) !== null) {
-					resultPrimarySelection = resultSelection;
+				if (Range.intersectRanges(deleteSelection, primaryCursor) !== null) {
+					endPrimaryCursor = resultSelection;
 				} else {
 					endCursorState.push(resultSelection);
 				}
@@ -642,7 +642,7 @@ export class JoinLinesAction extends EditorAction {
 			lineOffset += deleteSelection.endLineNumber - deleteSelection.startLineNumber;
 		}
 
-		endCursorState.unshift(resultPrimarySelection);
+		endCursorState.unshift(endPrimaryCursor);
 		editor.executeEdits(this.id, edits, endCursorState);
 
 	}
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
@@ -3163,11 +3163,12 @@ declare module monaco.editor {
          */
         pushUndoStop(): boolean;
         /**
-         * Execute a command on the editor.
+         * Execute edits on the editor.
          * @param source The source of the call.
-         * @param command The command to execute
+         * @param edits The edits to execute.
+         * @param endCursoState Cursor state after the edits were applied.
          */
-        executeEdits(source: string, edits: IIdentifiedSingleEditOperation[]): boolean;
+        executeEdits(source: string, edits: IIdentifiedSingleEditOperation[], endCursoState?: Selection[]): boolean;
         /**
          * Execute multiple (concommitent) commands on the editor.
          * @param source The source of the call.

Original file line number	Diff line number	Diff line change
`@@ -518,16 +518,16 @@ export class JoinLinesAction extends EditorAction {`
`518`	`518`
`519`	`519`	`public run(accessor: ServicesAccessor, editor: ICommonCodeEditor): void {`
`520`	`520`	`let selections = editor.getSelections();`
`521`		`- let primarySelection = editor.getSelection();`
	`521`	`+ let primaryCursor = editor.getSelection();`
`522`	`522`
`523`	`523`	`selections.sort(Range.compareRangesUsingStarts);`
`524`	`524`	`let reducedSelections: Selection[] = [];`
`525`	`525`
`526`	`526`	`let lastSelection = selections.reduce((previousValue, currentValue) => {`
`527`	`527`	`if (previousValue.isEmpty()) {`
`528`	`528`	`if (previousValue.endLineNumber === currentValue.startLineNumber) {`
`529`		`- if (primarySelection.equalsSelection(previousValue)) {`
`530`		`- primarySelection = currentValue;`
	`529`	`+ if (primaryCursor.equalsSelection(previousValue)) {`
	`530`	`+ primaryCursor = currentValue;`
`531`	`531`	`}`
`532`	`532`	`return currentValue;`
`533`	`533`	`}`
`@@ -553,7 +553,7 @@ export class JoinLinesAction extends EditorAction {`
`553`	`553`	`let model = editor.getModel();`
`554`	`554`	`let edits = [];`
`555`	`555`	`let endCursorState = [];`
`556`		`- let resultPrimarySelection = primarySelection;`
	`556`	`+ let endPrimaryCursor = primaryCursor;`
`557`	`557`	`let lineOffset = 0;`
`558`	`558`
`559`	`559`	`for (let i = 0, len = reducedSelections.length; i < len; i++) {`
`@@ -632,8 +632,8 @@ export class JoinLinesAction extends EditorAction {`
`632`	`632`	`}`
`633`	`633`	`}`
`634`	`634`
`635`		`- if (Range.intersectRanges(deleteSelection, primarySelection) !== null) {`
`636`		`- resultPrimarySelection = resultSelection;`
	`635`	`+ if (Range.intersectRanges(deleteSelection, primaryCursor) !== null) {`
	`636`	`+ endPrimaryCursor = resultSelection;`
`637`	`637`	`} else {`
`638`	`638`	`endCursorState.push(resultSelection);`
`639`	`639`	`}`
`@@ -642,7 +642,7 @@ export class JoinLinesAction extends EditorAction {`
`642`	`642`	`lineOffset += deleteSelection.endLineNumber - deleteSelection.startLineNumber;`
`643`	`643`	`}`
`644`	`644`
`645`		`- endCursorState.unshift(resultPrimarySelection);`
	`645`	`+ endCursorState.unshift(endPrimaryCursor);`
`646`	`646`	`editor.executeEdits(this.id, edits, endCursorState);`
`647`	`647`
`648`	`648`	`}`