CHE-1900: Update editor to Orion 12 (eclipse-che#2522)

CHE-1900: Update editor to Orion 12
JPinkney · Sep 21, 2016 · e339ced · e339ced
1 parent 7c8946d
commit e339ced
Show file tree

Hide file tree

Showing 34 changed files with 11,573 additions and 9,608 deletions.
diff --git a/plugins/plugin-orion/che-plugin-orion-compare/pom.xml b/plugins/plugin-orion/che-plugin-orion-compare/pom.xml
@@ -67,7 +67,7 @@
                 <configuration>
                     <excludes>
                         <!-- Orion - EPL License -->
-                        <exclude>**/orion/public/built-compare-11.0/*</exclude>
+                        <exclude>**/orion/public/built-compare-12.0/*</exclude>
                     </excludes>
                 </configuration>
             </plugin>

diff --git a/...che-plugin-orion-compare/src/main/resources/org/eclipse/che/ide/orion/public/Compare.html b/...che-plugin-orion-compare/src/main/resources/org/eclipse/che/ide/orion/public/Compare.html
@@ -27,7 +27,7 @@
     <script src="require.js"></script>
     <script>
         var compare, widget, requirePromise = new Promise(function (resolve, reject) {
-            require(["./built-compare-11.0/built-compare-amd.min.js"], function (Compare) {
+            require(["./built-compare-12.0/built-compare-amd.min.js"], function (Compare) {
                 resolve(Compare);
             });
         });

diff --git a/...in/resources/org/eclipse/che/ide/orion/public/built-compare-11.0/built-compare-amd.min.js b/...in/resources/org/eclipse/che/ide/orion/public/built-compare-11.0/built-compare-amd.min.js
diff --git a/...lt-compare-11.0/OrionIconFont-Regular.eot → ...lt-compare-12.0/OrionIconFont-Regular.eot b/...lt-compare-11.0/OrionIconFont-Regular.eot → ...lt-compare-12.0/OrionIconFont-Regular.eot
diff --git a/...lt-compare-11.0/OrionIconFont-Regular.svg → ...lt-compare-12.0/OrionIconFont-Regular.svg b/...lt-compare-11.0/OrionIconFont-Regular.svg → ...lt-compare-12.0/OrionIconFont-Regular.svg
diff --git a/...lt-compare-11.0/OrionIconFont-Regular.ttf → ...lt-compare-12.0/OrionIconFont-Regular.ttf b/...lt-compare-11.0/OrionIconFont-Regular.ttf → ...lt-compare-12.0/OrionIconFont-Regular.ttf
diff --git a/...t-compare-11.0/OrionIconFont-Regular.woff → ...t-compare-12.0/OrionIconFont-Regular.woff b/...t-compare-11.0/OrionIconFont-Regular.woff → ...t-compare-12.0/OrionIconFont-Regular.woff
diff --git a/...in/resources/org/eclipse/che/ide/orion/public/built-compare-12.0/built-compare-amd.min.js b/...in/resources/org/eclipse/che/ide/orion/public/built-compare-12.0/built-compare-amd.min.js
diff --git a/...blic/built-compare-11.0/built-compare.css → ...blic/built-compare-12.0/built-compare.css b/...blic/built-compare-11.0/built-compare.css → ...blic/built-compare-12.0/built-compare.css
@@ -1,9 +1,9 @@
 
 .headerLayout {
-	height: 50px;
+	height: 35px;
 }
 .toolbarLayout {
-	height: 50px;
+	height: 35px;
 
 	display: -webkit-box;
 	display: -moz-box;
@@ -91,7 +91,7 @@
     top: 0;
 
     bottom: 0;
-    left: 50px;
+    left: 35px;
     right: 0;
     background: #3b4b54;
 
@@ -252,7 +252,7 @@
 }
 .toolbarTarget {
 	position: absolute;
-	top: 50px;  
+	top: 35px;  
  	width: 100%;
  	overflow-y: auto;
 }
@@ -261,11 +261,11 @@
 }
 .pageLayoutTarget {
 	position: absolute;
- 	width: calc( 100% - 60px );
+ 	width: calc( 100% - 15px );
  	bottom: 0;
  	overflow-y: auto;
 	box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.33); 
-	margin: 20px;
+	margin: 5px;
 	margin-right: 0;
 	padding-top: 10px;
 	padding-bottom: 5px;
@@ -438,7 +438,7 @@ and (max-device-width : 1024px)  {
 	margin-right: 0 !important;
 }
 .sideMenu{
-    width: 50px;
+    width: 35px;
     background: #26343F;
 	float: left;
     position: absolute;
@@ -471,7 +471,7 @@ and (max-device-width : 1024px)  {
 }
 .sideMenuHome{
 	width: 100%;
-	height: 50px;
+	height: 35px;
 }
 .sideMenuList{
 	display:inline-block !important;
@@ -523,7 +523,7 @@ and (max-device-width : 1024px)  {
 	text-decoration:none !important;
 	width: 100%;
 	display: inline-block;
-	padding: 9px 0px 12px 0px;
+	padding: 4px 0 4px 0;
 }
 .sideMenuItem>.submenu-trigger:hover, .sideMenuItem.expanded>.submenu-trigger{
 	text-decoration:none;
@@ -635,12 +635,12 @@ and (max-device-width : 1024px)  {
 }
 .mainContent{
 	position:absolute;
-	left:50px;
+	left:35px;
 }
 .innerPanels{
 	position:absolute;
 	width:100%;
-	top:50px;
+	top:35px;
 	bottom:0;
 }
 .userMenu {
@@ -715,13 +715,16 @@ and (max-device-width : 1024px)  {
 	padding-bottom:10px;
 	height:24px;
 }
+.splashMessages {
+}
 .splashMessage {
 	color: white;
 	font-size: 14px;
 }
 .splashDetailedMessage {
 	color: white;
-	font-size: 14px;
+	font-size: 12px;
+	padding-left: 20px;
 }
 .splashVisual {
 	width: 24px;
@@ -1333,7 +1336,6 @@ textarea.parameterInput {
 }
 .mainNavColumn {
 	display: inline-block;
-	padding: 2px;
 	vertical-align: baseline;
 	white-space: nowrap;
 }
@@ -2066,7 +2068,7 @@ html[dir="rtl"] .modifiedFileMarker{
 	border-collapse: collapse;
 	border-spacing: 0;
 	padding: 0;
-	margin-top: 40px;
+	margin-top: 5px;
 	overflow-y: hidden; 
 }
 html[dir="rtl"] .sectionWrapper, html[dir="rtl"] .sectionTable{ 
@@ -2083,8 +2085,8 @@ html[dir="rtl"] .sectionWrapper, html[dir="rtl"] .sectionTable{
 }
 .sectionTable {
 	margin-top: 0;
-	margin-left: 8%;
-	margin-right: 8%;
+	margin-left: 5px;
+	margin-right: 5px;
 	border: 1px solid #f1f3f4;
 	-webkit-transition: all 0.1s ease, left 0;
 	transition: all 0.1s ease, left 0;
@@ -2096,7 +2098,7 @@ html[dir="rtl"] .sectionWrapper, html[dir="rtl"] .sectionTable{
 	border-top: none;
 }
 .sectionTable:last-child {
-	margin-bottom: 20px;
+	margin-bottom: 5px;
 }
 .sectionTable.sectionClosed {
 	height: 0;
@@ -2106,8 +2108,8 @@ html[dir="rtl"] .sectionWrapper, html[dir="rtl"] .sectionTable{
 }
 .sectionWrapper{
 	border: 1px solid;
-	margin-left: 8%;
-	margin-right: 8%;
+	margin-left: 5px;
+	margin-right: 5px;
 	background: none repeat scroll 0 0 #f4f4f4;
 	vertical-align: middle;
 	font-weight: bold;
@@ -2502,7 +2504,7 @@ html[dir="rtl"] .fileExplorerProgressDiv {
 	-moz-osx-font-smoothing: grayscale;
 }
 .core-sprite-questionmark {
-	font-weight: bold;
+	padding-bottom: 3px;
 }
 .core-sprite-hamburger {
 	margin-top: -3px;
@@ -2573,7 +2575,6 @@ html[dir="rtl"] .fileExplorerProgressDiv {
 }
 .core-sprite-git-logo {
 	font-size: 20px;
-	padding-bottom: 10px !important;
 }
 .core-sprite-page,
 .core-sprite-horizontal,
@@ -2640,7 +2641,7 @@ html[dir="rtl"] .fileExplorerProgressDiv {
 .core-sprite-horizontal:before{ content:'\E042'; }
 .core-sprite-vertical:before{ content:'\E041'; }
 .core-sprite-pip:before{ content:'\E067'; }
-.core-sprite-questionmark:before{ content:'?'; }
+.core-sprite-questionmark:before{ content:'\E043'; }
 
 .file-sprite-javascript:before{ content:'\E00D'; }
 .file-sprite-css:before{ content:'\E00C'; }
@@ -2715,7 +2716,7 @@ html[dir="rtl"] .fileExplorerProgressDiv {
 	height: 100%;
 }
 .rulerLines {
-	color: silver;
+	color: #767676; 
 }
 .rulerLines.even
 .rulerLines.odd {
@@ -2807,13 +2808,16 @@ html[dir="rtl"] .fileExplorerProgressDiv {
 .textviewTooltip .hoverTooltipTitle {
 	font-weight: normal;
 }
+.textviewTooltip .quickFixList { 
+	margin-top: 5px;
+}
 .textviewTooltip .commandButton { 
 	border: 1px solid #325C80;
 	background-color: inherit;
 	color: white;
 }
 .textviewTooltip .commandButton:not(.dropdownTrigger){ 
-  text-transform: initial; 
+	text-transform: initial; 
 }
 .textviewTooltip .commandList > li {
 	margin: 0;
@@ -2925,11 +2929,11 @@ html[dir="rtl"] .fileExplorerProgressDiv {
 }
 .contentassist .proposal-noemphasis-title-keywords {
 	background-color: aliceblue;
-	color: gray;
+	color: #717171;  
 }
 .contentassist .proposal-noemphasis-title {
 	background-color: aliceblue;
-	color: gray;
+	color: #717171;  
 	padding-top: 5px;
 }
 .contentassist .proposal-default {
@@ -3787,7 +3791,7 @@ a.breadcrumb.currentLocation {
 .mainpane {
 	border: 0;
 	background: #3B4B54 !important;
-	padding-right:20px;
+	padding-right:5px;
 }
 .mainToolbar {
 	color: white;
@@ -4426,6 +4430,7 @@ a.breadcrumb.currentLocation {
 	visibility: hidden;
 	z-index: 175;  
 	position: absolute;
+	color: #222;
 	background-color: #fbfbfb;
 	border-radius: 2px;
 	border: 1px solid #BBB;

diff --git a/...ion-compare/src/main/resources/org/eclipse/che/ide/orion/public/built-compare-codenvy.css b/...ion-compare/src/main/resources/org/eclipse/che/ide/orion/public/built-compare-codenvy.css
@@ -4578,11 +4578,11 @@ a.breadcrumb.currentLocation {
 
 @font-face {
   font-family: 'Orion Icon Font';
-  src: url('built-compare-11.0/OrionIconFont-Regular.eot');
-  src: url('built-compare-11.0/OrionIconFont-Regular.eot?#iefix') format('embedded-opentype'),
-       url('built-compare-11.0/OrionIconFont-Regular.woff') format('woff'),
-       url('built-compare-11.0/OrionIconFont-Regular.ttf')  format('truetype'),
-       url('built-compare-11.0/OrionIconFont-Regular.svg#04b530a8db6e0f4a0fdb83697b7ace5f') format('svg');
+  src: url('built-compare-12.0/OrionIconFont-Regular.eot');
+  src: url('built-compare-12.0/OrionIconFont-Regular.eot?#iefix') format('embedded-opentype'),
+       url('built-compare-12.0/OrionIconFont-Regular.woff') format('woff'),
+       url('built-compare-12.0/OrionIconFont-Regular.ttf')  format('truetype'),
+       url('built-compare-12.0/OrionIconFont-Regular.svg#04b530a8db6e0f4a0fdb83697b7ace5f') format('svg');
 
   font-style:   normal;
   font-weight:  400;

diff --git a/...ompare/src/main/resources/org/eclipse/che/ide/orion/public/built-compare-dark-codenvy.css b/...ompare/src/main/resources/org/eclipse/che/ide/orion/public/built-compare-dark-codenvy.css
@@ -4581,11 +4581,11 @@ a.breadcrumb.currentLocation {
 
 @font-face {
   font-family: 'Orion Icon Font';
-  src: url('built-compare-11.0/OrionIconFont-Regular.eot');
-  src: url('built-compare-11.0/OrionIconFont-Regular.eot?#iefix') format('embedded-opentype'),
-       url('built-compare-11.0/OrionIconFont-Regular.woff') format('woff'),
-       url('built-compare-11.0/OrionIconFont-Regular.ttf')  format('truetype'),
-       url('built-compare-11.0/OrionIconFont-Regular.svg#04b530a8db6e0f4a0fdb83697b7ace5f') format('svg');
+  src: url('built-compare-12.0/OrionIconFont-Regular.eot');
+  src: url('built-compare-12.0/OrionIconFont-Regular.eot?#iefix') format('embedded-opentype'),
+       url('built-compare-12.0/OrionIconFont-Regular.woff') format('woff'),
+       url('built-compare-12.0/OrionIconFont-Regular.ttf')  format('truetype'),
+       url('built-compare-12.0/OrionIconFont-Regular.svg#04b530a8db6e0f4a0fdb83697b7ace5f') format('svg');
 
   font-style:   normal;
   font-weight:  400;

diff --git a/plugins/plugin-orion/che-plugin-orion-editor/pom.xml b/plugins/plugin-orion/che-plugin-orion-editor/pom.xml
@@ -123,10 +123,10 @@
                         <configuration>
                             <patchDirectory>${patches.location}</patchDirectory>
                             <patches>
-                                <patch>built-codeEdit-amd.js.diff</patch>
+                                <patch>fix_linked_mode.diff</patch>
                                 <patch>fix_goto_line.diff</patch>
+                                <patch>fix_scrolling.diff</patch>
                                 <patch>fix_focus.diff</patch>
-                                <patch>embeddedToolingPlugin.js.diff</patch>
                             </patches>
                             <optimizations>false</optimizations>
                             <strictPatching>true</strictPatching>
@@ -160,11 +160,8 @@
                 <configuration>
                     <excludes>
                         <!-- Orion - EPL License -->
-                        <exclude>**/org/eclipse/che/ide/editor/orion/public/built-codeEdit-11.0/**</exclude>
-                        <exclude>**/patches/built-codeEdit-amd.js.diff</exclude>
-                        <exclude>**/patches/fix_goto_line.diff</exclude>
-                        <exclude>**/patches/fix_focus.diff</exclude>
-                        <exclude>**/patches/embeddedToolingPlugin.js.diff</exclude>
+                        <exclude>**/org/eclipse/che/ide/editor/orion/public/built-codeEdit-12.0/**</exclude>
+                        <exclude>**/org/eclipse/che/ide/editor/orion/public/cheJavaHighlightingPlugin/lib/plugin.js</exclude>
                     </excludes>
                 </configuration>
             </plugin>

diff --git a/...on-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorExtension.java b/...on-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorExtension.java
@@ -81,7 +81,7 @@ public void makeCall(AsyncCallback<Void> callback) {
     private void injectOrion(final AsyncCallback<Void> callback) {
         loader.setMessage(waitEditorMessage);
         final String[] scripts = new String[]{
-                "built-codeEdit-11.0/code_edit/built-codeEdit-amd",
+                "built-codeEdit-12.0/code_edit/built-codeEdit-amd",
                 "orion/CheContentAssistMode"
         };
 
@@ -111,7 +111,7 @@ public void onFailure(final Throwable e) {
             }
         }, scripts, new String[0]);
 
-        injectCssLink(GWT.getModuleBaseForStaticFiles() + "built-codeEdit-11.0/code_edit/built-codeEdit.css");
+        injectCssLink(GWT.getModuleBaseForStaticFiles() + "built-codeEdit-12.0/code_edit/built-codeEdit.css");
     }
 
     private static void injectCssLink(final String url) {

diff --git a/...main/java/org/eclipse/che/ide/editor/orion/client/inject/JavaHighlightingOrionPlugin.java b/...main/java/org/eclipse/che/ide/editor/orion/client/inject/JavaHighlightingOrionPlugin.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2012-2016 Codenvy, S.A.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Codenvy, S.A. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.che.ide.editor.orion.client.inject;
+
+/**
+ * Plugin that fixes some Orion's highlighting issues for Java files.
+ *
+ * @author Artem Zatsarynnyi
+ */
+public class JavaHighlightingOrionPlugin implements OrionPlugin {
+
+    @Override
+    public String getRelPath() {
+        return "cheJavaHighlightingPlugin/plugin.html";
+    }
+}
diff --git a/...or/src/main/java/org/eclipse/che/ide/editor/orion/client/inject/OrionEditorGinModule.java b/...or/src/main/java/org/eclipse/che/ide/editor/orion/client/inject/OrionEditorGinModule.java
@@ -12,6 +12,7 @@
 
 import com.google.gwt.inject.client.AbstractGinModule;
 import com.google.gwt.inject.client.assistedinject.GinFactoryModuleBuilder;
+import com.google.gwt.inject.client.multibindings.GinMultibinder;
 import com.google.inject.Singleton;
 import com.google.inject.TypeLiteral;
 
@@ -39,5 +40,6 @@ protected void configure() {
 
         install(new GinFactoryModuleBuilder().build(ContentAssistWidgetFactory.class));
 
+        GinMultibinder.newSetBinder(binder(), OrionPlugin.class).addBinding().to(JavaHighlightingOrionPlugin.class);
     }
 }
diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/patches/embeddedToolingPlugin.js.diff b/plugins/plugin-orion/che-plugin-orion-editor/src/main/patches/embeddedToolingPlugin.js.diff
diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/patches/fix_focus.diff b/plugins/plugin-orion/che-plugin-orion-editor/src/main/patches/fix_focus.diff
@@ -1,9 +1,9 @@
 This patch fixes bug related to setting active EditorView on switching between different tabs.
 ===================================================================
-diff --git a/org/eclipse/che/ide/editor/orion/public/built-codeEdit-11.0/code_edit/built-codeEdit-amd.js b/org/eclipse/che/ide/editor/orion/public/built-codeEdit-11.0/code_edit/built-codeEdit-amd.js
---- a/org/eclipse/che/ide/editor/orion/public/built-codeEdit-11.0/code_edit/built-codeEdit-amd.js
-+++ b/org/eclipse/che/ide/editor/orion/public/built-codeEdit-11.0/code_edit/built-codeEdit-amd.js
-@@ -42184,6 +42184,9 @@
+diff --git a/org/eclipse/che/ide/editor/orion/public/built-codeEdit-12.0/code_edit/built-codeEdit-amd.js b/org/eclipse/che/ide/editor/orion/public/built-codeEdit-12.0/code_edit/built-codeEdit-amd.js
+--- a/org/eclipse/che/ide/editor/orion/public/built-codeEdit-12.0/code_edit/built-codeEdit-amd.js
++++ b/org/eclipse/che/ide/editor/orion/public/built-codeEdit-12.0/code_edit/built-codeEdit-amd.js
+@@ -43282,6 +43282,9 @@
  			domNode.addEventListener("mousedown", function() { //$NON-NLS-0$
  				this.setActiveEditorView(this.editorView);
  			}.bind(this), true);