From 86e4bcfaee107b7060468f4ce00244050b0f15e9 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 7 Feb 2020 15:43:43 +0100 Subject: [PATCH] show strike through for deletes, #89504 --- .../contrib/bulkEdit/browser/{media => }/bulkEdit.css | 4 ++++ src/vs/workbench/contrib/bulkEdit/browser/bulkEditPane.ts | 2 +- src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts | 8 +++++--- 3 files changed, 10 insertions(+), 4 deletions(-) rename src/vs/workbench/contrib/bulkEdit/browser/{media => }/bulkEdit.css (92%) diff --git a/src/vs/workbench/contrib/bulkEdit/browser/media/bulkEdit.css b/src/vs/workbench/contrib/bulkEdit/browser/bulkEdit.css similarity index 92% rename from src/vs/workbench/contrib/bulkEdit/browser/media/bulkEdit.css rename to src/vs/workbench/contrib/bulkEdit/browser/bulkEdit.css index 6d9d6dc391a..0fe1b8f31ef 100644 --- a/src/vs/workbench/contrib/bulkEdit/browser/media/bulkEdit.css +++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkEdit.css @@ -35,6 +35,10 @@ opacity: .5; } +.monaco-workbench .bulk-edit-panel .monaco-tl-contents .monaco-icon-label.delete .monaco-icon-label-container { + text-decoration: line-through; +} + .monaco-workbench .bulk-edit-panel .monaco-tl-contents .details { margin-left: .5em; opacity: .7; diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditPane.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditPane.ts index 64f34718084..adcac3afafd 100644 --- a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditPane.ts +++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditPane.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./media/bulkEdit'; +import 'vs/css!./bulkEdit'; import { WorkbenchAsyncDataTree, TreeResourceNavigator, IOpenEvent } from 'vs/platform/list/browser/listService'; import { WorkspaceEdit } from 'vs/editor/common/modes'; import { BulkEditElement, BulkEditDelegate, TextEditElementRenderer, FileElementRenderer, BulkEditDataSource, BulkEditIdentityProvider, FileElement, TextEditElement, BulkEditAccessibilityProvider, BulkEditAriaProvider, CategoryElementRenderer, BulkEditNaviLabelProvider, CategoryElement } from 'vs/workbench/contrib/bulkEdit/browser/bulkEditTree'; diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts index 37984510df1..4a50a0b6b89 100644 --- a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts +++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts @@ -459,19 +459,21 @@ class FileElementTemplate { } else { // create, delete, edit: NAME - this._label.setFile(element.edit.uri, { + const options = { matches: createMatches(score), fileKind: FileKind.FILE, fileDecorations: { colors: true, badges: false }, - }); - + extraClasses: [] + }; if (element.edit.type & BulkFileOperationType.Create) { this._details.innerText = localize('detail.create', "(creating)"); } else if (element.edit.type & BulkFileOperationType.Delete) { this._details.innerText = localize('detail.del', "(deleting)"); + options.extraClasses.push('delete'); } else { this._details.innerText = ''; } + this._label.setFile(element.edit.uri, options); } } } -- GitLab