From e367f30db6250fa52b0e4f229dd3749ba9a82e6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pouya=20Kary=20=E2=9C=A8?= Date: Fri, 24 Mar 2023 08:35:14 +0330 Subject: [PATCH 1/2] Fixes #177580 (#177581) fixed the spelling in commentGlyphForground to commentGlyphForeground Co-authored-by: Martin Aeschlimann --- build/lib/stylelint/vscode-known-variables.json | 2 +- src/vs/workbench/contrib/comments/browser/commentGlyphWidget.ts | 2 +- src/vs/workbench/contrib/comments/browser/media/review.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json index 3cfd72e5f7e..e3173ca1ae3 100644 --- a/build/lib/stylelint/vscode-known-variables.json +++ b/build/lib/stylelint/vscode-known-variables.json @@ -190,7 +190,7 @@ "--vscode-editorGroupHeader-tabsBorder", "--vscode-editorGutter-addedBackground", "--vscode-editorGutter-background", - "--vscode-editorGutter-commentGlyphForground", + "--vscode-editorGutter-commentGlyphForeground", "--vscode-editorGutter-commentRangeForeground", "--vscode-editorGutter-commentUnresolvedGlyphForeground", "--vscode-editorGutter-deletedBackground", diff --git a/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.ts b/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.ts index 61a64383714..febd46f585a 100644 --- a/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.ts +++ b/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.ts @@ -14,7 +14,7 @@ import { IEditorDecorationsCollection } from 'vs/editor/common/editorCommon'; import { CommentThreadState } from 'vs/editor/common/languages'; export const overviewRulerCommentingRangeForeground = registerColor('editorGutter.commentRangeForeground', { dark: opaque(listInactiveSelectionBackground, editorBackground), light: darken(opaque(listInactiveSelectionBackground, editorBackground), .05), hcDark: Color.white, hcLight: Color.black }, nls.localize('editorGutterCommentRangeForeground', 'Editor gutter decoration color for commenting ranges. This color should be opaque.')); -const editorGutterCommentGlyphForeground = registerColor('editorGutter.commentGlyphForground', { dark: editorForeground, light: editorForeground, hcDark: Color.black, hcLight: Color.white }, nls.localize('editorGutterCommentGlyphForeground', 'Editor gutter decoration color for commenting glyphs.')); +const editorGutterCommentGlyphForeground = registerColor('editorGutter.commentGlyphForeground', { dark: editorForeground, light: editorForeground, hcDark: Color.black, hcLight: Color.white }, nls.localize('editorGutterCommentGlyphForeground', 'Editor gutter decoration color for commenting glyphs.')); registerColor('editorGutter.commentUnresolvedGlyphForeground', { dark: editorGutterCommentGlyphForeground, light: editorGutterCommentGlyphForeground, hcDark: editorGutterCommentGlyphForeground, hcLight: editorGutterCommentGlyphForeground }, nls.localize('editorGutterCommentUnresolvedGlyphForeground', 'Editor gutter decoration color for commenting glyphs for unresolved comment threads.')); export class CommentGlyphWidget { diff --git a/src/vs/workbench/contrib/comments/browser/media/review.css b/src/vs/workbench/contrib/comments/browser/media/review.css index c801d2980a5..7ec097c1779 100644 --- a/src/vs/workbench/contrib/comments/browser/media/review.css +++ b/src/vs/workbench/contrib/comments/browser/media/review.css @@ -509,7 +509,7 @@ div.preview.inline .monaco-editor .comment-range-glyph { width: 9px; left: -6px; z-index: 10; - color: var(--vscode-editorGutter-commentGlyphForground); + color: var(--vscode-editorGutter-commentGlyphForeground); text-align: center; display: flex; flex-direction: row; From fabb5745425b3e1836000995deea37601e3024a8 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 24 Mar 2023 06:20:19 +0100 Subject: [PATCH 2/2] disable editor rulers (#178152) --- .../contrib/interactiveEditor/browser/interactiveEditorWidget.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorWidget.ts b/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorWidget.ts index 87613bdb595..30c90fa7930 100644 --- a/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorWidget.ts +++ b/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorWidget.ts @@ -136,6 +136,7 @@ class InteractiveEditorWidget { revealHorizontalRightPadding: 5, minimap: { enabled: false }, guides: { indentation: false }, + rulers: [], cursorWidth: 1, wrappingStrategy: 'advanced', wrappingIndent: 'none',