From 5f788db54e1271d9d4d942b826630df344428ef7 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Mon, 9 Jan 2017 12:53:39 +0100
Subject: [PATCH] Move Toggle Word Wrap up to /workbench/

---
 src/vs/editor/browser/editor.all.ts                         | 1 -
 src/vs/workbench/electron-browser/workbench.main.ts         | 2 ++
 .../workbench/parts/codeEditor/codeEditor.contribution.ts   | 6 ++++++
 .../parts/codeEditor/electron-browser}/toggleWordWrap.ts    | 0
 4 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
 rename src/vs/{editor/contrib/toggleWordWrap/common => workbench/parts/codeEditor/electron-browser}/toggleWordWrap.ts (100%)

diff --git a/src/vs/editor/browser/editor.all.ts b/src/vs/editor/browser/editor.all.ts
index 7c67fa7af39..2cd0530de45 100644
--- a/src/vs/editor/browser/editor.all.ts
+++ b/src/vs/editor/browser/editor.all.ts
@@ -38,7 +38,6 @@ import 'vs/editor/contrib/suggest/common/snippetCompletion';
 import 'vs/editor/contrib/suggest/browser/suggestController';
 import 'vs/editor/contrib/suggest/browser/tabCompletion';
 import 'vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode';
-import 'vs/editor/contrib/toggleWordWrap/common/toggleWordWrap';
 import 'vs/css!vs/editor/contrib/wordHighlighter/browser/wordHighlighter';
 import 'vs/editor/contrib/wordHighlighter/common/wordHighlighter';
 import 'vs/editor/contrib/folding/browser/folding';
diff --git a/src/vs/workbench/electron-browser/workbench.main.ts b/src/vs/workbench/electron-browser/workbench.main.ts
index 373004d7afe..f0752a06f23 100644
--- a/src/vs/workbench/electron-browser/workbench.main.ts
+++ b/src/vs/workbench/electron-browser/workbench.main.ts
@@ -80,7 +80,9 @@ import 'vs/workbench/parts/tasks/electron-browser/task.contribution';
 import 'vs/workbench/parts/emmet/browser/emmet.browser.contribution';
 import 'vs/workbench/parts/emmet/node/emmet.contribution';
 
+// Code Editor enhacements
 import 'vs/workbench/parts/indentation/common/indentation';
+import 'vs/workbench/parts/codeEditor/codeEditor.contribution';
 
 import 'vs/workbench/parts/execution/electron-browser/execution.contribution';
 import 'vs/workbench/parts/execution/electron-browser/terminal.contribution';
diff --git a/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts b/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
new file mode 100644
index 00000000000..12e1fc1d7f7
--- /dev/null
+++ b/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './electron-browser/toggleWordWrap';
diff --git a/src/vs/editor/contrib/toggleWordWrap/common/toggleWordWrap.ts b/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts
similarity index 100%
rename from src/vs/editor/contrib/toggleWordWrap/common/toggleWordWrap.ts
rename to src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts
-- 
GitLab