try scm decorator

eclipse-theia · Nov 1, 2021 · 739b6c1 · 739b6c1
1 parent 579313c
commit 739b6c1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 53 deletions.
diff --git a/packages/editor-preview/package.json b/packages/editor-preview/package.json
@@ -5,7 +5,6 @@
   "dependencies": {
     "@theia/core": "1.19.0",
     "@theia/editor": "1.19.0",
-    "@theia/filesystem": "1.19.0",
     "@theia/navigator": "1.19.0"
   },
   "publishConfig": {

diff --git a/packages/editor-preview/src/browser/editor-preview-tree-decorator.ts b/packages/editor-preview/src/browser/editor-preview-tree-decorator.ts
@@ -20,7 +20,6 @@ import { Emitter } from '@theia/core/lib/common/event';
 import { Tree } from '@theia/core/lib/browser/tree/tree';
 import {
     ApplicationShell,
-    CorePreferences,
     DepthFirstTreeIterator,
     FrontendApplication,
     FrontendApplicationContribution,
@@ -32,17 +31,11 @@ import { Disposable } from '@theia/core/lib/common';
 import { OpenEditorNode } from '@theia/navigator/lib/browser/open-editors-widget/navigator-open-editors-tree-model';
 import { EditorPreviewWidget } from './editor-preview-widget';
 import { EditorPreviewManager } from './editor-preview-manager';
-import { FileService } from '@theia/filesystem/lib/browser/file-service';
-import { FileChangesEvent } from '@theia/filesystem/lib/common/files';
 
 @injectable()
 export class EditorPreviewTreeDecorator implements TreeDecorator, FrontendApplicationContribution {
     @inject(EditorPreviewManager) protected readonly editorPreviewManager: EditorPreviewManager;
     @inject(ApplicationShell) protected readonly shell: ApplicationShell;
-    @inject(CorePreferences) protected readonly corePreferences: CorePreferences;
-    @inject(FileService) protected readonly fileService: FileService;
-
-    protected deletedEditorIds = new Set<string>();
 
     readonly id = 'theia-open-editors-file-decorator';
     protected decorationsMap = new Map<string, TreeDecoration.Data>();
@@ -56,35 +49,6 @@ export class EditorPreviewTreeDecorator implements TreeDecorator, FrontendApplic
         this.shell.onDidAddWidget(widget => this.registerEditorListeners(widget));
         this.shell.onDidRemoveWidget(widget => this.unregisterEditorListeners(widget));
         this.editorWidgets.forEach(widget => this.registerEditorListeners(widget));
-        this.fileService.onDidFilesChange(async (event: FileChangesEvent) => {
-            if (!this.corePreferences['workbench.editor.closeOnFileDelete']) {
-                await this.checkForEditorDeleted(event);
-                this.fireDidChangeDecorations((tree: Tree) => this.collectDecorators(tree));
-            }
-        });
-    }
-
-    protected async checkForEditorDeleted(event: FileChangesEvent): Promise<void> {
-        // this implementation to check for deleted files is necessary since the gotDeleted check is not always reliable
-        const fileExistPromises: Promise<void>[] = [];
-        this.editorWidgets.forEach(editor => {
-            const editorURI = editor.getResourceUri();
-            if (editorURI && event.contains(editorURI)) {
-                const fileExistsPromise = this.fileService.exists(editorURI)
-                    .then(doesExist => {
-                        if (doesExist) {
-                            this.deletedEditorIds.delete(editor.id);
-                        } else {
-                            this.deletedEditorIds.add(editor.id);
-                        }
-                    });
-                fileExistPromises.push(fileExistsPromise);
-            }
-        });
-        if (!fileExistPromises.length) {
-            return;
-        }
-        await Promise.all(fileExistPromises);
     }
 
     protected registerEditorListeners(widget: Widget): void {
@@ -129,18 +93,13 @@ export class EditorPreviewTreeDecorator implements TreeDecorator, FrontendApplic
             return result;
         }
         for (const node of new DepthFirstTreeIterator(tree.root)) {
-            if (OpenEditorNode.is(node) && NavigatableWidget.is(node.widget)) {
+            if (OpenEditorNode.is(node)) {
                 const { widget } = node;
                 const isPreviewWidget = widget instanceof EditorPreviewWidget && widget.isPreview;
-                const deleted = this.deletedEditorIds.has(widget.id);
-                const style: TreeDecoration.FontStyle[] = [];
-                if (isPreviewWidget) {
-                    style.push('italic');
-                }
-                if (deleted) {
-                    style.push('line-through');
-                }
-                result.set(node.id, { fontData: { style } });
+                const decorations: TreeDecoration.Data = {
+                    fontData: { style: isPreviewWidget ? 'italic' : undefined }
+                };
+                result.set(node.id, decorations);
             }
         }
         return result;

diff --git a/packages/editor-preview/tsconfig.json b/packages/editor-preview/tsconfig.json
@@ -14,12 +14,6 @@
     },
     {
       "path": "../editor"
-    },
-    {
-      "path": "../filesystem"
-    },
-    {
-      "path": "../navigator"
     }
   ]
 }
diff --git a/packages/scm/src/browser/decorations/scm-navigator-decorator.ts b/packages/scm/src/browser/decorations/scm-navigator-decorator.ts
@@ -64,6 +64,7 @@ export class ScmNavigatorDecorator implements TreeDecorator {
     protected toDecorator(change: Decoration): TreeDecoration.Data {
         const colorVariable = change.colorId && this.colors.toCssVariableName(change.colorId);
         return {
+            fontData: change.letter === "D" ? { style: 'line-through' } : undefined,
             tailDecorations: [
                 {
                     data: change.letter ? change.letter : '',