Merge pull request microsoft#158629 from justschen/justin/moreWidgetWork

justschen · web-flow · commit 4ec47f2389d1 · 2022-08-19T14:29:29.000-07:00
Fixes issue with contrast in light themes and code action settings bug
diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionMenu.ts b/src/vs/editor/contrib/codeAction/browser/codeActionMenu.ts
@@ -299,7 +299,7 @@ export class CodeActionMenu extends Disposable implements IEditorContribution {
 	 * Checks if the settings have enabled the new code action widget.
 	 */
 	private isCodeActionWidgetEnabled(model: ITextModel): boolean {
-		return this._configurationService.getValue('editor.experimental.useCustomCodeActionMenu', {
+		return this._configurationService.getValue('editor.useCustomCodeActionMenu', {
 			resource: model.uri
 		});
 	}
diff --git a/src/vs/editor/contrib/codeAction/browser/media/action.css b/src/vs/editor/contrib/codeAction/browser/media/action.css
@@ -71,6 +71,7 @@
 .codeActionMenuWidget .monaco-list .monaco-list-row:hover:not(.option-disabled),
 .codeActionMenuWidget .monaco-list .monaco-list-row.focused:not(.option-disabled) {
 	background-color: var(--vscode-list-hoverBackground) !important;
+	color: var(--vscode-list-activeSelectionForeground) !important;
 }
 
 .codeActionMenuWidget .monaco-list .monaco-list-row.focused:not(.option-disabled)  {

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ export class CodeActionMenu extends Disposable implements IEditorContribution {`
`299`	`299`	`* Checks if the settings have enabled the new code action widget.`
`300`	`300`	`*/`
`301`	`301`	`private isCodeActionWidgetEnabled(model: ITextModel): boolean {`
`302`		`- return this._configurationService.getValue('editor.experimental.useCustomCodeActionMenu', {`
	`302`	`+ return this._configurationService.getValue('editor.useCustomCodeActionMenu', {`
`303`	`303`	`resource: model.uri`
`304`	`304`	`});`
`305`	`305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@`
`71`	`71`	`.codeActionMenuWidget .monaco-list .monaco-list-row:hover:not(.option-disabled),`
`72`	`72`	`.codeActionMenuWidget .monaco-list .monaco-list-row.focused:not(.option-disabled) {`
`73`	`73`	`background-color: var(--vscode-list-hoverBackground) !important;`
	`74`	`+ color: var(--vscode-list-activeSelectionForeground) !important;`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`.codeActionMenuWidget .monaco-list .monaco-list-row.focused:not(.option-disabled) {`