Merge pull request microsoft#184322 from microsoft/aiday/issue181480

aiday-mar · web-flow · commit 41a3e40fc4f2 · 2023-06-05T14:15:30.000+02:00
Showing the standalone color picker at the model state position, not view state
diff --git a/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerWidget.ts b/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerWidget.ts
@@ -109,7 +109,7 @@ export class StandaloneColorPickerWidget extends Disposable implements IContentW
 		super();
 		this._standaloneColorPickerVisible.set(true);
 		this._standaloneColorPickerParticipant = _instantiationService.createInstance(StandaloneColorPickerParticipant, this._editor);
-		this._position = this._editor._getViewModel()?.getPrimaryCursorState().viewState.position;
+		this._position = this._editor._getViewModel()?.getPrimaryCursorState().modelState.position;
 		const editorSelection = this._editor.getSelection();
 		const selection = editorSelection ?
 			{

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ export class StandaloneColorPickerWidget extends Disposable implements IContentW`
`109`	`109`	`super();`
`110`	`110`	`this._standaloneColorPickerVisible.set(true);`
`111`	`111`	`this._standaloneColorPickerParticipant = _instantiationService.createInstance(StandaloneColorPickerParticipant, this._editor);`
`112`		`- this._position = this._editor._getViewModel()?.getPrimaryCursorState().viewState.position;`
	`112`	`+ this._position = this._editor._getViewModel()?.getPrimaryCursorState().modelState.position;`
`113`	`113`	`const editorSelection = this._editor.getSelection();`
`114`	`114`	`const selection = editorSelection ?`
`115`	`115`	`{`