From ea6ecccb68d21e5f0dc671ec8eaebd478e7fc58b Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@gmail.com>
Date: Mon, 11 Mar 2019 18:43:10 +0100
Subject: [PATCH] debt - avoid approot for resources in renderer (#70237)

---
 build/gulpfile.vscode.js                                    | 3 ---
 src/vs/workbench/browser/parts/editor/editorGroupView.ts    | 6 ++----
 .../browser/parts/editor/media}/letterpress-dark.svg        | 0
 .../browser/parts/editor/media}/letterpress-hc.svg          | 0
 .../workbench/browser/parts/editor/media}/letterpress.svg   | 0
 5 files changed, 2 insertions(+), 7 deletions(-)
 rename {resources => src/vs/workbench/browser/parts/editor/media}/letterpress-dark.svg (100%)
 rename {resources => src/vs/workbench/browser/parts/editor/media}/letterpress-hc.svg (100%)
 rename {resources => src/vs/workbench/browser/parts/editor/media}/letterpress.svg (100%)

diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 041ceea7419..179931d290d 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -310,8 +310,6 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 
 		const license = gulp.src(['LICENSES.chromium.html', 'LICENSE.txt', 'ThirdPartyNotices.txt', 'licenses/**'], { base: '.', allowEmpty: true });
 
-		const watermark = gulp.src(['resources/letterpress.svg', 'resources/letterpress-dark.svg', 'resources/letterpress-hc.svg'], { base: '.' });
-
 		// TODO the API should be copied to `out` during compile, not here
 		const api = gulp.src('src/vs/vscode.d.ts').pipe(rename('out/vs/vscode.d.ts'));
 
@@ -347,7 +345,6 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			packageJsonStream,
 			productJsonStream,
 			license,
-			watermark,
 			api,
 			sources,
 			deps
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
index 421352abd2a..4d03a2d9ab5 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
@@ -33,7 +33,6 @@ import { EventType as TouchEventType, GestureEvent } from 'vs/base/browser/touch
 import { TitleControl } from 'vs/workbench/browser/parts/editor/titleControl';
 import { IEditorGroupsAccessor, IEditorGroupView, IEditorPartOptionsChangeEvent, getActiveTextEditorOptions, IEditorOpeningEvent } from 'vs/workbench/browser/parts/editor/editor';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
-import { join } from 'vs/base/common/path';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ActionRunner, IAction, Action } from 'vs/base/common/actions';
@@ -44,7 +43,6 @@ import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { fillInContextMenuActions } from 'vs/platform/actions/browser/menuItemActionItem';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { isErrorWithActions, IErrorWithActions } from 'vs/base/common/errorsWithActions';
-import { URI } from 'vs/base/common/uri';
 import { IActiveEditor } from 'vs/workbench/services/editor/common/editorService';
 
 export class EditorGroupView extends Themable implements IEditorGroupView {
@@ -1466,10 +1464,10 @@ export interface EditorReplacement {
 registerThemingParticipant((theme, collector, environment) => {
 
 	// Letterpress
-	const letterpress = `resources/letterpress${theme.type === 'dark' ? '-dark' : theme.type === 'hc' ? '-hc' : ''}.svg`;
+	const letterpress = `./media/letterpress${theme.type === 'dark' ? '-dark' : theme.type === 'hc' ? '-hc' : ''}.svg`;
 	collector.addRule(`
 		.monaco-workbench .part.editor > .content .editor-group-container.empty .editor-group-letterpress {
-			background-image: url('${URI.file(join(environment.appRoot, letterpress)).toString()}')
+			background-image: url('${require.toUrl(letterpress)}')
 		}
 	`);
 
diff --git a/resources/letterpress-dark.svg b/src/vs/workbench/browser/parts/editor/media/letterpress-dark.svg
similarity index 100%
rename from resources/letterpress-dark.svg
rename to src/vs/workbench/browser/parts/editor/media/letterpress-dark.svg
diff --git a/resources/letterpress-hc.svg b/src/vs/workbench/browser/parts/editor/media/letterpress-hc.svg
similarity index 100%
rename from resources/letterpress-hc.svg
rename to src/vs/workbench/browser/parts/editor/media/letterpress-hc.svg
diff --git a/resources/letterpress.svg b/src/vs/workbench/browser/parts/editor/media/letterpress.svg
similarity index 100%
rename from resources/letterpress.svg
rename to src/vs/workbench/browser/parts/editor/media/letterpress.svg