From 8b421f77bc95a6656b1144b3c173a91baf489d4a Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Fri, 8 Dec 2023 15:12:54 +0800 Subject: [PATCH 1/6] Fixes #200309 --- .../browser/parts/editor/media/multieditortabscontrol.css | 1 - 1 file changed, 1 deletion(-) diff --git a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css index f675a11075da8..80e3a39915fec 100644 --- a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css +++ b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css @@ -326,7 +326,6 @@ .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink > .monaco-icon-label > .monaco-icon-label-container, .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-fixed > .monaco-icon-label > .monaco-icon-label-container { text-overflow: clip; - flex: none; } .monaco-workbench.hc-black .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink > .monaco-icon-label > .monaco-icon-label-container, From 5888793ca9787a4717a70f12c83f98f4777e1fc3 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Wed, 3 Jan 2024 11:26:17 +0800 Subject: [PATCH 2/6] Fix tab title is covered when italic --- src/vs/base/browser/ui/iconLabel/iconlabel.css | 4 ++++ .../browser/parts/editor/media/multieditortabscontrol.css | 1 + 2 files changed, 5 insertions(+) diff --git a/src/vs/base/browser/ui/iconLabel/iconlabel.css b/src/vs/base/browser/ui/iconLabel/iconlabel.css index 47f8891703c46..f5ebd8ebfa173 100644 --- a/src/vs/base/browser/ui/iconLabel/iconlabel.css +++ b/src/vs/base/browser/ui/iconLabel/iconlabel.css @@ -76,6 +76,10 @@ font-style: italic; } +.monaco-icon-label.italic > .monaco-icon-label-container > .monaco-icon-name-container { + padding-right: 2px; /* fix for https://github.com/microsoft/vscode/issues/200309 */ +} + .monaco-icon-label.deprecated { text-decoration: line-through; opacity: 0.66; diff --git a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css index fb2a88930c9a1..9d470d6c1606a 100644 --- a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css +++ b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css @@ -326,6 +326,7 @@ .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink > .monaco-icon-label > .monaco-icon-label-container, .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-fixed > .monaco-icon-label > .monaco-icon-label-container { text-overflow: clip; + flex: none; } .monaco-workbench.hc-black .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink > .monaco-icon-label > .monaco-icon-label-container, From 8d14fe381b0f7ea75ced3686ff41a3083d6e9a73 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Mon, 8 Jan 2024 19:11:17 +0800 Subject: [PATCH 3/6] docs: editorGroupView bug? --- src/vs/workbench/browser/parts/editor/editorGroupView.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts index a51faaefc2353..b5568864c46eb 100644 --- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts +++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts @@ -194,6 +194,8 @@ export class EditorGroupView extends Themable implements IEditorGroupView { // Scoped instantiation service this.scopedInstantiationService = this.instantiationService.createChild(new ServiceCollection( + // FIXME: 从缓存中恢复 tab 状态，依赖 scopedContextKeyService 如果换用全局单例的 contextKeyService，右侧面板首次会从有 => 无； + // 但是打开节点之后，resource 上下文更新，需要依赖最外部的全局 contextKeyService，像现在这样直接使用 scopedContextKeyService 会导致拿不到 resource 更新之后的值。 [IContextKeyService, this.scopedContextKeyService], [IEditorProgressService, this._register(new EditorProgressIndicator(this.progressBar, this))] )); From c979d80ef1141b823b38c9c9ac7e78a9f0416ac1 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Wed, 10 Jan 2024 10:15:49 +0800 Subject: [PATCH 4/6] docs --- src/vs/workbench/common/component.ts | 2 +- src/vs/workbench/contrib/preferences/browser/settingsTree.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/common/component.ts b/src/vs/workbench/common/component.ts index 6c25dc9d977e6..e588dd5ee9e54 100644 --- a/src/vs/workbench/common/component.ts +++ b/src/vs/workbench/common/component.ts @@ -48,7 +48,7 @@ export class Component extends Themable { protected onDidChangeMementoValue(scope: StorageScope, disposables: DisposableStore): Event { return this.memento.onDidChangeValue(scope, disposables); } - + // TODO: 各种操作，只对 model 进行操作，写入数据通过 saveState override 接口触发。 protected saveState(): void { // Subclasses to implement for storing state } diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts index 8a24222eac302..78a0d82e1cb66 100644 --- a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts +++ b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts @@ -2138,6 +2138,7 @@ function cleanRenderedMarkdown(element: Node): void { } function fixSettingLinks(text: string, linkify = true): string { + // FIXME: 对 Settings 中的可点击链接，做匹配。 return text.replace(/`#([^#\s`]+)#`|'#([^#\s']+)#'/g, (match, backticksGroup, quotesGroup) => { const settingKey: string = backticksGroup ?? quotesGroup; const targetDisplayFormat = settingKeyToDisplayFormat(settingKey); From 5bc7ab77e203986afcaccac349cce35c980dea26 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Tue, 23 Jan 2024 16:38:13 +0800 Subject: [PATCH 5/6] fix: remove comment --- src/vs/workbench/browser/parts/editor/editorGroupView.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts index e90d1200d4f5d..acd91eb9c3313 100644 --- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts +++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts @@ -194,8 +194,6 @@ export class EditorGroupView extends Themable implements IEditorGroupView { // Scoped instantiation service this.scopedInstantiationService = this.instantiationService.createChild(new ServiceCollection( - // FIXME: 从缓存中恢复 tab 状态，依赖 scopedContextKeyService 如果换用全局单例的 contextKeyService，右侧面板首次会从有 => 无； - // 但是打开节点之后，resource 上下文更新，需要依赖最外部的全局 contextKeyService，像现在这样直接使用 scopedContextKeyService 会导致拿不到 resource 更新之后的值。 [IContextKeyService, this.scopedContextKeyService], [IEditorProgressService, this._register(new EditorProgressIndicator(this.progressBar, this))] )); From b0eb9a4b6b9e2e47482d947eb1f2040eaf92980f Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Tue, 23 Jan 2024 16:39:48 +0800 Subject: [PATCH 6/6] fix: remove comment --- src/vs/workbench/common/component.ts | 2 +- src/vs/workbench/contrib/preferences/browser/settingsTree.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/vs/workbench/common/component.ts b/src/vs/workbench/common/component.ts index e588dd5ee9e54..6c25dc9d977e6 100644 --- a/src/vs/workbench/common/component.ts +++ b/src/vs/workbench/common/component.ts @@ -48,7 +48,7 @@ export class Component extends Themable { protected onDidChangeMementoValue(scope: StorageScope, disposables: DisposableStore): Event { return this.memento.onDidChangeValue(scope, disposables); } - // TODO: 各种操作，只对 model 进行操作，写入数据通过 saveState override 接口触发。 + protected saveState(): void { // Subclasses to implement for storing state } diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts index 78a0d82e1cb66..8a24222eac302 100644 --- a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts +++ b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts @@ -2138,7 +2138,6 @@ function cleanRenderedMarkdown(element: Node): void { } function fixSettingLinks(text: string, linkify = true): string { - // FIXME: 对 Settings 中的可点击链接，做匹配。 return text.replace(/`#([^#\s`]+)#`|'#([^#\s']+)#'/g, (match, backticksGroup, quotesGroup) => { const settingKey: string = backticksGroup ?? quotesGroup; const targetDisplayFormat = settingKeyToDisplayFormat(settingKey);