#83 Update to Theia 1.18.0 and support Codicons (#85)

* #83 Update to Theia 1.18.0 and support Codicons

- Update Theia to 1.18.0
- Update Jenkinsfile to use eclipsetheia/theia-blueprint docker image to be able to build Theia >=1.15.0 (which requires libsecret-1-dev)
- Update sprotty to latest version
- Use Codicons instead of FontAwesome icons


Co-authored-by: Nina Doschek <ndoschek@eclipsesource.com>

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 This change log covers only the Theia integration of Sprotty. See also the change logs of [sprotty](https://github.com/eclipse/sprotty/blob/master/CHANGELOG.md), [sprotty-server](https://github.com/eclipse/sprotty-server/blob/master/CHANGELOG.md) and [sprotty-layout](https://github.com/eclipse/sprotty-layout/blob/master/CHANGELOG.md).
 
+### v0.10.0 (upcoming)
+
+Breaking API changes:
+* Upgraded to Theia 1.18.0 ([#85]((https://github.com/eclipse/sprotty-theia/pull/85))
+
+-----
+
 ### v0.9.0 (Aug. 2020)
 
 New features:

Jenkinsfile

@@ -4,7 +4,7 @@ kind: Pod
 spec:
   containers:
   - name: node
-    image: node:12.18.3
+    image: eclipsetheia/theia-blueprint
     tty: true
     resources:
       limits:
@@ -13,13 +13,28 @@ spec:
       requests:
         memory: "2Gi"
         cpu: "1"
+    command:
+    - cat
     volumeMounts:
+    - mountPath: "/home/jenkins"
+      name: "jenkins-home"
+      readOnly: false
     - mountPath: "/.yarn"
       name: "yarn-global"
-      readonly: false
+      readOnly: false
+    - name: global-cache
+      mountPath: /.cache     
+    - name: global-npm
+      mountPath: /.npm      
   volumes:
+  - name: "jenkins-home"
+    emptyDir: {}
   - name: "yarn-global"
     emptyDir: {}
+  - name: global-cache
+    emptyDir: {}
+  - name: global-npm
+    emptyDir: {}
 """
 
 pipeline {

css/theia-sprotty.css

@@ -70,7 +70,7 @@
     color: var(--theia-inputValidation-infoBackground);
 }
 
-.sprotty-infoRow .fa {
+.sprotty-infoRow .codicon {
     margin-right: 8px;
 }
 .sprotty-status .ok {

package.json

@@ -48,6 +48,7 @@
     "@types/mocha": "^8.0.0",
     "chai": "^4.2.0",
     "jenkins-mocha": "^8.0.0",
+    "keytar": "^7.7.0",
     "mocha": "^8.1.0",
     "rimraf": "^3.0.2",
     "semver": "^7.3.2",

src/theia/diagram-widget.ts

@@ -20,7 +20,7 @@ import {
 } from 'sprotty';
 import { Widget } from "@phosphor/widgets";
 import { Message } from "@phosphor/messaging/lib";
-import { BaseWidget } from '@theia/core/lib/browser/widgets/widget';
+import { BaseWidget, codiconArray } from '@theia/core/lib/browser/widgets/widget';
 import { StatefulWidget, Navigatable } from '@theia/core/lib/browser';
 import URI from '@theia/core/lib/common/uri';
 import { TheiaSprottyConnector } from '../sprotty/theia-sprotty-connector';
@@ -225,20 +225,16 @@ export class DiagramWidget extends BaseWidget implements StatefulWidget, Navigat
             classes.add(status.severity.toLowerCase());
             switch (status.severity) {
                 case 'FATAL':
-                    classes.add('fa');
-                    classes.add('fa-times-circle');
+                    classes.add(...codiconArray('error'));
                     break;
                 case 'ERROR':
-                    classes.add('fa');
-                    classes.add('fa-exclamation-circle');
+                    classes.add(...codiconArray('warning'));
                     break;
                 case 'WARNING':
-                    classes.add('fa');
-                    classes.add('fa-exclamation-circle');
+                    classes.add(...codiconArray('warning'));
                     break;
                 case 'INFO':
-                    classes.add('fa');
-                    classes.add('fa-info-circle');
+                    classes.add(...codiconArray('info'));
                     break;
             }
         }