Commitc0d3263

authored

Merge pull request#135805 from martinzimmermann/fix-26393

Fixes#26393 by changing the default behavior of InsertCursorAbove/Below

2 parents7d8f55e +a696fa1 commitc0d3263Copy full SHA for c0d3263

File tree

+33

-2

lines changed

src/vs/editor/contrib/multicursor
- multicursor.ts
- test
  - multicursor.test.ts

+33

-2

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,10 @@ export class InsertCursorAbove extends EditorAction {`
`70`	`70`	`return;`
`71`	`71`	`}`
`72`	`72`
`73`		`-constuseLogicalLine=(args&&args.logicalLine===true);`
	`73`	`+letuseLogicalLine=true;`
	`74`	`+if(args&&args.logicalLine===false){`
	`75`	`+useLogicalLine=false;`
	`76`	`+}`
`74`	`77`	`constviewModel=editor._getViewModel();`
`75`	`78`
`76`	`79`	`if(viewModel.cursorConfig.readOnly){`
`@@ -120,7 +123,10 @@ export class InsertCursorBelow extends EditorAction {`
`120`	`123`	`return;`
`121`	`124`	`}`
`122`	`125`
`123`		`-constuseLogicalLine=(args&&args.logicalLine===true);`
	`126`	`+letuseLogicalLine=true;`
	`127`	`+if(args&&args.logicalLine===false){`
	`128`	`+useLogicalLine=false;`
	`129`	`+}`
`124`	`130`	`constviewModel=editor._getViewModel();`
`125`	`131`
`126`	`132`	`if(viewModel.cursorConfig.readOnly){`

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,31 @@ import { IStorageService } from 'vs/platform/storage/common/storage';`
`16`	`16`
`17`	`17`	`suite('Multicursor',()=>{`
`18`	`18`
	`19`	`+`
	`20`	`+test('issue #26393: Multiple cursors + Word wrap',()=>{`
	`21`	`+withTestCodeEditor([`
	`22`	`+'a'.repeat(20),`
	`23`	`+'a'.repeat(20),`
	`24`	`+],{wordWrap:'wordWrapColumn',wordWrapColumn:10},(editor,viewModel)=>{`
	`25`	`+letaddCursorDownAction=newInsertCursorBelow();`
	`26`	`+addCursorDownAction.run(null!,editor,{});`
	`27`	`+`
	`28`	`+assert.strictEqual(viewModel.getCursorStates().length,2);`
	`29`	`+`
	`30`	`+assert.strictEqual(viewModel.getCursorStates()[0].viewState.position.lineNumber,1);`
	`31`	`+assert.strictEqual(viewModel.getCursorStates()[1].viewState.position.lineNumber,3);`
	`32`	`+`
	`33`	`+editor.setPosition({lineNumber:4,column:1});`
	`34`	`+letaddCursorUpAction=newInsertCursorAbove();`
	`35`	`+addCursorUpAction.run(null!,editor,{});`
	`36`	`+`
	`37`	`+assert.strictEqual(viewModel.getCursorStates().length,2);`
	`38`	`+`
	`39`	`+assert.strictEqual(viewModel.getCursorStates()[0].viewState.position.lineNumber,4);`
	`40`	`+assert.strictEqual(viewModel.getCursorStates()[1].viewState.position.lineNumber,2);`
	`41`	`+});`
	`42`	`+});`
	`43`	`+`
`19`	`44`	`test('issue #2205: Multi-cursor pastes in reverse order',()=>{`
`20`	`45`	`withTestCodeEditor([`
`21`	`46`	`'abc',`

Comments

(0)