@theia/core 1.27.0 → 1.28.0-next.10

package/README.md

@@ -86,12 +86,12 @@ export class SomeClass {
     - `@phosphor/signaling` (from [`@phosphor/signaling@1`](https://www.npmjs.com/package/@phosphor/signaling))
     - `@phosphor/virtualdom` (from [`@phosphor/virtualdom@1`](https://www.npmjs.com/package/@phosphor/virtualdom))
     - `@phosphor/widgets` (from [`@phosphor/widgets@1`](https://www.npmjs.com/package/@phosphor/widgets))
-    - `@theia/application-package` (from [`@theia/application-package@1.27.0`](https://www.npmjs.com/package/@theia/application-package/v/1.27.0))
-    - `@theia/application-package/lib/api` (from [`@theia/application-package@1.27.0`](https://www.npmjs.com/package/@theia/application-package/v/1.27.0))
-    - `@theia/application-package/lib/environment` (from [`@theia/application-package@1.27.0`](https://www.npmjs.com/package/@theia/application-package/v/1.27.0))
-    - `@theia/request` (from [`@theia/request@1.27.0`](https://www.npmjs.com/package/@theia/request/v/1.27.0))
-    - `@theia/request/lib/proxy` (from [`@theia/request@1.27.0`](https://www.npmjs.com/package/@theia/request/v/1.27.0))
-    - `@theia/request/lib/node-request-service` (from [`@theia/request@1.27.0`](https://www.npmjs.com/package/@theia/request/v/1.27.0))
+    - `@theia/application-package` (from [`@theia/application-package@1.28.0-next.10+69a4daf82ac`](https://www.npmjs.com/package/@theia/application-package/v/1.28.0-next.10))
+    - `@theia/application-package/lib/api` (from [`@theia/application-package@1.28.0-next.10+69a4daf82ac`](https://www.npmjs.com/package/@theia/application-package/v/1.28.0-next.10))
+    - `@theia/application-package/lib/environment` (from [`@theia/application-package@1.28.0-next.10+69a4daf82ac`](https://www.npmjs.com/package/@theia/application-package/v/1.28.0-next.10))
+    - `@theia/request` (from [`@theia/request@1.28.0-next.10+69a4daf82ac`](https://www.npmjs.com/package/@theia/request/v/1.28.0-next.10))
+    - `@theia/request/lib/proxy` (from [`@theia/request@1.28.0-next.10+69a4daf82ac`](https://www.npmjs.com/package/@theia/request/v/1.28.0-next.10))
+    - `@theia/request/lib/node-request-service` (from [`@theia/request@1.28.0-next.10+69a4daf82ac`](https://www.npmjs.com/package/@theia/request/v/1.28.0-next.10))
     - `fs-extra` (from [`fs-extra@^4.0.2`](https://www.npmjs.com/package/fs-extra))
     - `fuzzy` (from [`fuzzy@^0.1.3`](https://www.npmjs.com/package/fuzzy))
     - `inversify` (from [`inversify@^5.1.1`](https://www.npmjs.com/package/inversify))

package/lib/browser/preloader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preloader.d.ts","sourceRoot":"","sources":["../../src/browser/preloader.ts"],"names":[],"mappings":"AAuDA,wBAAsB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAM7C"}
+{"version":3,"file":"preloader.d.ts","sourceRoot":"","sources":["../../src/browser/preloader.ts"],"names":[],"mappings":"AAiEA,wBAAsB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAM7C"}

package/lib/browser/preloader.js

@@ -33,7 +33,17 @@ async function loadTranslations() {
     }
     if (nls_1.nls.locale) {
         const response = await fetchFrom(`/i18n/${nls_1.nls.locale}`);
-        nls_1.nls.localization = await response.json();
+        const localization = await response.json();
+        if (localization.languagePack) {
+            nls_1.nls.localization = localization;
+        }
+        else {
+            // In case the localization that we've loaded doesn't localize Theia completely (languagePack is false)
+            // We simply reset the locale to the default again
+            Object.assign(nls_1.nls, {
+                locale: defaultLocale || undefined
+            });
+        }
     }
 }
 async function loadBackendOS() {

package/lib/browser/preloader.js.map

@@ -1 +1 @@
-{"version":3,"file":"preloader.js","sourceRoot":"","sources":["../../src/browser/preloader.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAEhF,uCAAoC;AACpC,yCAAsC;AACtC,qCAAkC;AAClC,iGAAiI;AAEjI,SAAS,SAAS,CAAC,IAAY;IAC3B,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,CAAC;IAChE,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC;AAC3B,CAAC;AAED,KAAK,UAAU,gBAAgB;IAC3B,MAAM,aAAa,GAAG,wEAAiC,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC;IAC5E,IAAI,aAAa,IAAI,CAAC,SAAG,CAAC,MAAM,EAAE;QAC9B,MAAM,CAAC,MAAM,CAAC,SAAG,EAAE;YACf,MAAM,EAAE,aAAa;SACxB,CAAC,CAAC;KACN;IACD,IAAI,SAAG,CAAC,MAAM,EAAE;QACZ,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,SAAS,SAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QACxD,SAAG,CAAC,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;KAC5C;AACL,CAAC;AAED,KAAK,UAAU,aAAa;IACxB,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,KAAK,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAa,CAAC;IAChD,MAAM,SAAS,GAAG,MAAM,KAAK,SAAS,CAAC;IACvC,MAAM,KAAK,GAAG,MAAM,KAAK,KAAK,CAAC;IAC/B,OAAE,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;IACzB,OAAE,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IACjC,OAAE,CAAC,OAAO,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC;AACnC,CAAC;AAED,SAAS,cAAc;IACnB,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,2EAAoC,CAAC,IAAI,SAAS,CAAC;IAC7F,MAAM,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC;IACjD,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;AAC1E,CAAC;AAEM,KAAK,UAAU,OAAO;IACzB,MAAM,OAAO,CAAC,UAAU,CAAC;QACrB,gBAAgB,EAAE;QAClB,aAAa,EAAE;QACf,cAAc,EAAE;KACnB,CAAC,CAAC;AACP,CAAC;AAND,0BAMC"}
+{"version":3,"file":"preloader.js","sourceRoot":"","sources":["../../src/browser/preloader.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAEhF,uCAAoC;AACpC,yCAAsC;AACtC,qCAAkC;AAClC,iGAAiI;AAGjI,SAAS,SAAS,CAAC,IAAY;IAC3B,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,CAAC;IAChE,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC;AAC3B,CAAC;AAED,KAAK,UAAU,gBAAgB;IAC3B,MAAM,aAAa,GAAG,wEAAiC,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC;IAC5E,IAAI,aAAa,IAAI,CAAC,SAAG,CAAC,MAAM,EAAE;QAC9B,MAAM,CAAC,MAAM,CAAC,SAAG,EAAE;YACf,MAAM,EAAE,aAAa;SACxB,CAAC,CAAC;KACN;IACD,IAAI,SAAG,CAAC,MAAM,EAAE;QACZ,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,SAAS,SAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QACxD,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAkB,CAAC;QAC3D,IAAI,YAAY,CAAC,YAAY,EAAE;YAC3B,SAAG,CAAC,YAAY,GAAG,YAAY,CAAC;SACnC;aAAM;YACH,uGAAuG;YACvG,kDAAkD;YAClD,MAAM,CAAC,MAAM,CAAC,SAAG,EAAE;gBACf,MAAM,EAAE,aAAa,IAAI,SAAS;aACrC,CAAC,CAAC;SACN;KACJ;AACL,CAAC;AAED,KAAK,UAAU,aAAa;IACxB,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,KAAK,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAa,CAAC;IAChD,MAAM,SAAS,GAAG,MAAM,KAAK,SAAS,CAAC;IACvC,MAAM,KAAK,GAAG,MAAM,KAAK,KAAK,CAAC;IAC/B,OAAE,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;IACzB,OAAE,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IACjC,OAAE,CAAC,OAAO,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC;AACnC,CAAC;AAED,SAAS,cAAc;IACnB,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,2EAAoC,CAAC,IAAI,SAAS,CAAC;IAC7F,MAAM,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC;IACjD,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;AAC1E,CAAC;AAEM,KAAK,UAAU,OAAO;IACzB,MAAM,OAAO,CAAC,UAAU,CAAC;QACrB,gBAAgB,EAAE;QAClB,aAAa,EAAE;QACf,cAAc,EAAE;KACnB,CAAC,CAAC;AACP,CAAC;AAND,0BAMC"}

package/lib/common/color.d.ts

@@ -55,7 +55,10 @@ export interface HSLA {
 export interface ColorDefaults {
     light?: Color;
     dark?: Color;
+    /** @deprecated @since 1.28.0 Please use hcDark and hcLight. This field will be ignored unless `hcDark` is absent. */
     hc?: Color;
+    hcDark?: Color;
+    hcLight?: Color;
 }
 export interface ColorDefinition {
     id: string;

package/lib/common/color.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"color.d.ts","sourceRoot":"","sources":["../../src/common/color.ts"],"names":[],"mappings":"AAgBA;;GAEG;AACH,oBAAY,KAAK,GAAG,MAAM,GAAG,IAAI,GAAG,IAAI,GAAG,mBAAmB,CAAC;AAC/D,yBAAiB,KAAK,CAAC;IACnB,SAAgB,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAE,MAAU,GAAG,KAAK,CAE1E;IACD,SAAgB,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAE,MAAU,GAAG,KAAK,CAE1E;IACM,MAAM,KAAK,OAAyB,CAAC;IACrC,MAAM,KAAK,OAAmB,CAAC;IACtC,SAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAErE;IACD,SAAgB,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAEjE;IACD,SAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAEhE;CACJ;AACD,MAAM,WAAW,mBAAmB;IAChC,IAAI,EAAE,aAAa,GAAG,SAAS,GAAG,QAAQ,CAAA;IAC1C,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACZ;AACD,MAAM,WAAW,IAAI;IACjB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;CACtB;AACD,MAAM,WAAW,IAAI;IACjB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,aAAa;IAC1B,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,EAAE,CAAC,EAAE,KAAK,CAAA;CACb;AAED,MAAM,WAAW,eAAe;IAC5B,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,CAAC,EAAE,aAAa,CAAA;IACxB,WAAW,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CAChB"}
+{"version":3,"file":"color.d.ts","sourceRoot":"","sources":["../../src/common/color.ts"],"names":[],"mappings":"AAgBA;;GAEG;AACH,oBAAY,KAAK,GAAG,MAAM,GAAG,IAAI,GAAG,IAAI,GAAG,mBAAmB,CAAC;AAC/D,yBAAiB,KAAK,CAAC;IACnB,SAAgB,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAE,MAAU,GAAG,KAAK,CAE1E;IACD,SAAgB,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAE,MAAU,GAAG,KAAK,CAE1E;IACM,MAAM,KAAK,OAAyB,CAAC;IACrC,MAAM,KAAK,OAAmB,CAAC;IACtC,SAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAErE;IACD,SAAgB,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAEjE;IACD,SAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAEhE;CACJ;AACD,MAAM,WAAW,mBAAmB;IAChC,IAAI,EAAE,aAAa,GAAG,SAAS,GAAG,QAAQ,CAAA;IAC1C,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACZ;AACD,MAAM,WAAW,IAAI;IACjB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;CACtB;AACD,MAAM,WAAW,IAAI;IACjB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,aAAa;IAC1B,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,qHAAqH;IACrH,EAAE,CAAC,EAAE,KAAK,CAAA;IACV,MAAM,CAAC,EAAE,KAAK,CAAC;IACf,OAAO,CAAC,EAAE,KAAK,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC5B,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,CAAC,EAAE,aAAa,CAAA;IACxB,WAAW,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CAChB"}

package/lib/common/message-rpc/rpc-message-encoder.d.ts

@@ -63,22 +63,23 @@ export declare enum ObjectType {
     JSON = 0,
     ByteArray = 1,
     ObjectArray = 2,
-    Undefined = 3,
-    Object = 4,
-    String = 5,
-    Boolean = 6,
-    Number = 7,
-    ResponseError = 8,
-    Error = 9,
-    Map = 10,
-    Set = 11,
-    Function = 12
+    Null = 3,
+    Undefined = 4,
+    Object = 5,
+    String = 6,
+    Boolean = 7,
+    Number = 8,
+    ResponseError = 9,
+    Error = 10,
+    Map = 11,
+    Set = 12,
+    Function = 13
 }
 /**
  * A value encoder writes javascript values to a write buffer. Encoders will be asked
  * in turn (ordered by their tag value, descending) whether they can encode a given value
  * This means encoders with higher tag values have priority. Since the default encoders
- * have tag values from 1-12, they can be easily overridden.
+ * have tag values from 1-13, they can be easily overridden.
  */
 export interface ValueEncoder {
     /**

package/lib/common/message-rpc/rpc-message-encoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-message-encoder.d.ts","sourceRoot":"","sources":["../../../src/common/message-rpc/rpc-message-encoder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rpc-message-encoder.d.ts","sourceRoot":"","sources":["../../../src/common/message-rpc/rpc-message-encoder.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE3D;;;;;;GAMG;AAEH,oBAAY,UAAU,GAAG,cAAc,GAAG,YAAY,GAAG,eAAe,GAAG,aAAa,GAAG,mBAAmB,CAAC;AAE/G,0BAAkB,cAAc;IAC5B,OAAO,IAAI;IACX,YAAY,IAAI;IAChB,KAAK,IAAI;IACT,QAAQ,IAAI;IACZ,MAAM,IAAI;CACb;AAED,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,GAAG,EAAE,CAAC;CACf;AAED,MAAM,WAAW,mBAAmB;IAChC,IAAI,EAAE,cAAc,CAAC,YAAY,CAAC;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,GAAG,EAAE,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,cAAc,CAAC,KAAK,CAAC;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,GAAG,CAAC;CACZ;AAED,MAAM,WAAW,eAAe;IAC5B,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,GAAG,CAAC;CACZ;AAED,MAAM,WAAW,eAAe;IAC5B,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CAC1B;AAED;;;;GAIG;AACH,qBAAa,aAAc,SAAQ,KAAK;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAAmB,QAAQ,CAAC,IAAI,EAAE,GAAG;gBAAjD,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAW,IAAI,EAAE,GAAG;CAGzE;AAED;;GAEG;AAEH,oBAAY,UAAU;IAClB,IAAI,IAAI;IACR,SAAS,IAAI;IACb,WAAW,IAAI;IACf,IAAI,IAAI;IACR,SAAS,IAAI;IACb,MAAM,IAAI;IACV,MAAM,IAAI;IACV,OAAO,IAAI;IACX,MAAM,IAAI;IAEV,aAAa,IAAI;IACjB,KAAK,KAAK;IACV,GAAG,KAAK;IACR,GAAG,KAAK;IACR,QAAQ,KAAK;CAEhB;AAED;;;;;GAKG;AACH,MAAM,WAAW,YAAY;IACzB;;;OAGG;IACH,EAAE,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC;IACxB;;;;;;;;OAQG;IACH,KAAK,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;CACzK;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB;;;;;;;OAOG;IACH,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,eAAe,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,GAAG,OAAO,CAAC;CACjF;AAED;;;GAGG;AACH,qBAAa,aAAc,SAAQ,KAAK;gBACxB,GAAG,EAAE,MAAM;CAG1B;AAED;;GAEG;AACH,qBAAa,iBAAiB;IAE1B,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;;IAM1D,gBAAgB,IAAI,IAAI;IA8ExB;;;;;;OAMG;IACH,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;IAMzD,KAAK,CAAC,GAAG,EAAE,UAAU,GAAG,UAAU;IAwBlC,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,UAAU,GAAG,aAAa;IAQrD,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,UAAU,GAAG,cAAc;IAavD,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,UAAU,GAAG,mBAAmB;IAajE,UAAU,CAAC,GAAG,EAAE,UAAU,GAAG,YAAY;IAUzC,aAAa,CAAC,GAAG,EAAE,UAAU,GAAG,eAAe;IAY/C,SAAS,CAAC,GAAG,EAAE,UAAU,GAAG,GAAG,EAAE;IASjC,cAAc,CAAC,GAAG,EAAE,UAAU,GAAG,GAAG;CAQvC;AAED;;;;GAIG;AACH,qBAAa,iBAAiB;IAE1B,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAM;IAC3D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;;IAM3D,SAAS,CAAC,gBAAgB,IAAI,IAAI;IA+GlC;;;;;;OAMG;IACH,eAAe,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;IAQ5D,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAKjD,YAAY,CAAC,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAOpF,OAAO,CAAC,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAO/E,OAAO,CAAC,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI;IAM5D,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI;IAM7D,eAAe,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI;IA0BpF,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI;CAMpF"}

package/lib/common/message-rpc/rpc-message-encoder.js

@@ -38,17 +38,18 @@ var ObjectType;
     ObjectType[ObjectType["JSON"] = 0] = "JSON";
     ObjectType[ObjectType["ByteArray"] = 1] = "ByteArray";
     ObjectType[ObjectType["ObjectArray"] = 2] = "ObjectArray";
-    ObjectType[ObjectType["Undefined"] = 3] = "Undefined";
-    ObjectType[ObjectType["Object"] = 4] = "Object";
-    ObjectType[ObjectType["String"] = 5] = "String";
-    ObjectType[ObjectType["Boolean"] = 6] = "Boolean";
-    ObjectType[ObjectType["Number"] = 7] = "Number";
+    ObjectType[ObjectType["Null"] = 3] = "Null";
+    ObjectType[ObjectType["Undefined"] = 4] = "Undefined";
+    ObjectType[ObjectType["Object"] = 5] = "Object";
+    ObjectType[ObjectType["String"] = 6] = "String";
+    ObjectType[ObjectType["Boolean"] = 7] = "Boolean";
+    ObjectType[ObjectType["Number"] = 8] = "Number";
     // eslint-disable-next-line @typescript-eslint/no-shadow
-    ObjectType[ObjectType["ResponseError"] = 8] = "ResponseError";
-    ObjectType[ObjectType["Error"] = 9] = "Error";
-    ObjectType[ObjectType["Map"] = 10] = "Map";
-    ObjectType[ObjectType["Set"] = 11] = "Set";
-    ObjectType[ObjectType["Function"] = 12] = "Function";
+    ObjectType[ObjectType["ResponseError"] = 9] = "ResponseError";
+    ObjectType[ObjectType["Error"] = 10] = "Error";
+    ObjectType[ObjectType["Map"] = 11] = "Map";
+    ObjectType[ObjectType["Set"] = 12] = "Set";
+    ObjectType[ObjectType["Function"] = 13] = "Function";
 })(ObjectType = exports.ObjectType || (exports.ObjectType = {}));
 /**
  * Custom error thrown by the {@link RpcMessageEncoder} if an error occurred during the encoding and the
@@ -98,6 +99,10 @@ class RpcMessageDecoder {
         this.registerDecoder(ObjectType.Undefined, {
             read: () => undefined
         });
+        this.registerDecoder(ObjectType.Null, {
+            // eslint-disable-next-line no-null/no-null
+            read: () => null
+        });
         this.registerDecoder(ObjectType.Object, {
             read: (buf, recursiveRead) => {
                 const propertyCount = buf.readLength();
@@ -297,9 +302,13 @@ class RpcMessageEncoder {
             is: value => value instanceof Set,
             write: (buf, value, visitedObjects) => this.writeArray(buf, [...value], visitedObjects)
         });
-        this.registerEncoder(ObjectType.Undefined, {
+        this.registerEncoder(ObjectType.Null, {
             // eslint-disable-next-line no-null/no-null
-            is: value => value == null,
+            is: value => value === null,
+            write: () => { }
+        });
+        this.registerEncoder(ObjectType.Undefined, {
+            is: value => value === undefined,
             write: () => { }
         });
         this.registerEncoder(ObjectType.ObjectArray, {

package/lib/common/message-rpc/rpc-message-encoder.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-message-encoder.js","sourceRoot":"","sources":["../../../src/common/message-rpc/rpc-message-encoder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rpc-message-encoder.js","sourceRoot":"","sources":["../../../src/common/message-rpc/rpc-message-encoder.ts"],"names":[],"mappings":"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"}

package/lib/common/types.d.ts

@@ -60,6 +60,22 @@ export declare namespace ArrayUtils {
         RightBeforeLeft = 1,
         Equal = 0
     }
+    /**
+     * Performs a binary search algorithm over a sorted collection. Useful for cases
+     * when we need to perform a binary search over something that isn't actually an
+     * array, and converting data to an array would defeat the use of binary search
+     * in the first place.
+     *
+     * @param length The collection length.
+     * @param compareToKey A function that takes an index of an element in the
+     *   collection and returns zero if the value at this index is equal to the
+     *   search key, a negative number if the value precedes the search key in the
+     *   sorting order, or a positive number if the search key precedes the value.
+     * @return A non-negative index of an element, if found. If not found, the
+     *   result is -(n+1) (or ~n, using bitwise notation), where n is the index
+     *   where the key should be inserted to maintain the sorting order.
+     */
+    function binarySearch2(length: number, compareToKey: (index: number) => number): number;
 }
 /**
  * Throws when called and statically makes sure that all variants of a type were consumed.

package/lib/common/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/common/types.ts"],"names":[],"mappings":"AAgBA,oBAAY,OAAO,CAAC,CAAC,IAAI;IAAE,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAC5D,oBAAY,SAAS,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;CAAE,CAAC;AAC3D,oBAAY,cAAc,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS;CAAE,CAAC;AAErE;;GAEG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAS5E;AAED,oBAAY,QAAQ,CAAC,CAAC,IAAI;KACrB,CAAC,IAAI,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAChC,CAAC;AACF,oBAAY,gBAAgB,CAAC,CAAC,IAAI;KAC7B,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,CAAC,GAC1C,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,GAC1B,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC3B,CAAC;AACF,oBAAY,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AACpC,oBAAY,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;AAEjD,MAAM,WAAW,cAAc,CAAC,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;CACrB;AACD,yBAAiB,cAAc,CAAC;IAC5B,KAAY,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,YAAY,CAAC,MAAM,CAAC,CAAC;IAChE,KAAY,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM,CAAC;IACtD,SAAsB,gBAAgB,CAAC,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9H,SAAsB,gBAAgB,CAAC,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAWlI,SAAgB,oBAAoB,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,CAK3G;IACD,SAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,CAGtG;IACD,SAAsB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAG3H;IACD,SAAgB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAExD;IACD,SAAgB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,MAAM,CAE9E;CACJ;AAED,yBAAiB,UAAU,CAAC;IACxB,UAAiB,IAAI,CAAC,CAAC,CAAE,SAAQ,KAAK,CAAC,CAAC,CAAC;QACrC,IAAI,IAAI,CAAC,CAAC;KACb;IAED,UAAiB,IAAI,CAAC,CAAC,CAAE,SAAQ,KAAK,CAAC,CAAC,CAAC;QACrC,IAAI,IAAI,CAAC,CAAC;KACb;IAED,UAAiB,QAAQ,CAAC,CAAC,CAAE,SAAQ,KAAK,CAAC,CAAC,CAAC;QACzC,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,CAAA;KACtB;IAEM,MAAM,QAAQ;;KAIpB,CAAC;IAEK,MAAM,mBAAmB;;;KAQ/B,CAAC;IAEF,UAAiB,WAAW,CAAC,CAAC,CAAE,SAAQ,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;KAAI;IAEzE,SAAgB,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAElD;IAED,SAAgB,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAEhE;IAED,KAAY,IAAI;QACZ,eAAe,KAAK;QACpB,eAAe,IAAI;QACnB,KAAK,IAAI;KACZ;CACJ;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,GAAE,MAAyB,GAAG,KAAK,CAEpF"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/common/types.ts"],"names":[],"mappings":"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"}

package/lib/common/types.js

@@ -96,6 +96,41 @@ var ArrayUtils;
         Sort[Sort["RightBeforeLeft"] = 1] = "RightBeforeLeft";
         Sort[Sort["Equal"] = 0] = "Equal";
     })(Sort = ArrayUtils.Sort || (ArrayUtils.Sort = {}));
+    // Copied from https://github.com/microsoft/vscode/blob/9c29becfad5f68270b9b23efeafb147722c5feba/src/vs/base/common/arrays.ts
+    /**
+     * Performs a binary search algorithm over a sorted collection. Useful for cases
+     * when we need to perform a binary search over something that isn't actually an
+     * array, and converting data to an array would defeat the use of binary search
+     * in the first place.
+     *
+     * @param length The collection length.
+     * @param compareToKey A function that takes an index of an element in the
+     *   collection and returns zero if the value at this index is equal to the
+     *   search key, a negative number if the value precedes the search key in the
+     *   sorting order, or a positive number if the search key precedes the value.
+     * @return A non-negative index of an element, if found. If not found, the
+     *   result is -(n+1) (or ~n, using bitwise notation), where n is the index
+     *   where the key should be inserted to maintain the sorting order.
+     */
+    function binarySearch2(length, compareToKey) {
+        let low = 0;
+        let high = length - 1;
+        while (low <= high) {
+            const mid = ((low + high) / 2) | 0;
+            const comp = compareToKey(mid);
+            if (comp < 0) {
+                low = mid + 1;
+            }
+            else if (comp > 0) {
+                high = mid - 1;
+            }
+            else {
+                return mid;
+            }
+        }
+        return -(low + 1);
+    }
+    ArrayUtils.binarySearch2 = binarySearch2;
 })(ArrayUtils = exports.ArrayUtils || (exports.ArrayUtils = {}));
 /**
  * Throws when called and statically makes sure that all variants of a type were consumed.

package/lib/common/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/common/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/common/types.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAMhF;;GAEG;AACH,SAAgB,eAAe,CAAI,QAAsB;IACrD,MAAM,WAAW,GAAG,kBAAK,QAAQ,CAAuB,CAAC;IACzD,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;QACxB,2CAA2C;QAC3C,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE;YAC/E,WAAW,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;SAChC;KACJ;IACD,OAAO,WAAW,CAAC;AACvB,CAAC;AATD,0CASC;AAiBD,IAAiB,cAAc,CAmC9B;AAnCD,WAAiB,cAAc;IAKpB,KAAK,UAAU,gBAAgB,CAAI,QAAqC,EAAE,WAA2B;QACxG,IAAI,QAAQ,YAAY,KAAK,EAAE;YAC3B,OAAO,OAAO,CAAC,GAAG,CACd,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CACtD,CAAC;SACL;QACD,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC;QAC7B,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,CAAC;QAC1C,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAC/B,CAAC;IATqB,+BAAgB,mBASrC,CAAA;IACD,SAAgB,oBAAoB,CAAI,QAAa,EAAE,WAA+B;QAClF,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACtB,KAAK,EAAE,CAAC;YACR,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;SAC3B,CAAC,CAAC,CAAC;IACR,CAAC;IALe,mCAAoB,uBAKnC,CAAA;IACD,SAAgB,iBAAiB,CAAI,MAAW,EAAE,WAA+B;QAC7E,MAAM,cAAc,GAAG,oBAAoB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACjE,OAAO,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC;IAHe,gCAAiB,oBAGhC,CAAA;IACM,KAAK,UAAU,aAAa,CAAI,MAAyB,EAAE,WAA2B;QACzF,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACnE,OAAO,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC;IAHqB,4BAAa,gBAGlC,CAAA;IACD,SAAgB,OAAO,CAAI,CAAoB;QAC3C,OAAO,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC;IAC1B,CAAC;IAFe,sBAAO,UAEtB,CAAA;IACD,SAAgB,OAAO,CAAI,CAAoB,EAAE,EAAqB;QAClE,OAAO,EAAE,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;IACpC,CAAC;IAFe,sBAAO,UAEtB,CAAA;AACL,CAAC,EAnCgB,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAmC9B;AAED,IAAiB,UAAU,CA8E1B;AA9ED,WAAiB,UAAU;IAaV,mBAAQ,GAAG;QACpB,IAAI;YACA,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACjC,CAAC;KACJ,CAAC;IAEW,8BAAmB,GAAG;QAC/B,IAAI;YACA,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;QAED,QAAQ;YACJ,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,WAAA,QAAQ,CAAC,CAAC;QAClD,CAAC;KACJ,CAAC;IAIF,SAAgB,MAAM,CAAI,KAAe;QACrC,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,WAAA,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAFe,iBAAM,SAErB,CAAA;IAED,SAAgB,aAAa,CAAI,KAAe;QAC5C,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,WAAA,mBAAmB,EAAE,WAAA,QAAQ,CAAC,CAAC;IAC/D,CAAC;IAFe,wBAAa,gBAE5B,CAAA;IAED,IAAY,IAIX;IAJD,WAAY,IAAI;QACZ,sDAAoB,CAAA;QACpB,qDAAmB,CAAA;QACnB,iCAAS,CAAA;IACb,CAAC,EAJW,IAAI,GAAJ,eAAI,KAAJ,eAAI,QAIf;IAED,6HAA6H;IAC7H;;;;;;;;;;;;;;OAcG;IACH,SAAgB,aAAa,CAAC,MAAc,EAAE,YAAuC;QACjF,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,IAAI,IAAI,GAAG,MAAM,GAAG,CAAC,CAAC;QAEtB,OAAO,GAAG,IAAI,IAAI,EAAE;YAChB,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;YACnC,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,IAAI,GAAG,CAAC,EAAE;gBACV,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;aACjB;iBAAM,IAAI,IAAI,GAAG,CAAC,EAAE;gBACjB,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC;aAClB;iBAAM;gBACH,OAAO,GAAG,CAAC;aACd;SACJ;QACD,OAAO,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;IACtB,CAAC;IAhBe,wBAAa,gBAgB5B,CAAA;AACL,CAAC,EA9EgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QA8E1B;AAED;;GAEG;AACH,SAAgB,WAAW,CAAC,MAAa,EAAE,UAAkB,gBAAgB;IACzE,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC;AAFD,kCAEC"}

package/lib/node/i18n/localization-provider.d.ts

@@ -1,8 +1,9 @@
 import { LanguageInfo, Localization } from '../../common/i18n/localization';
 export declare class LocalizationProvider {
-    protected localizations: Map<string, Localization>;
+    protected localizations: Localization[];
     protected currentLanguage: string;
     addLocalizations(...localizations: Localization[]): void;
+    removeLocalizations(...localizations: Localization[]): void;
     setCurrentLanguage(languageId: string): void;
     getCurrentLanguage(): string;
     getAvailableLanguages(all?: boolean): LanguageInfo[];

package/lib/node/i18n/localization-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"localization-provider.d.ts","sourceRoot":"","sources":["../../../src/node/i18n/localization-provider.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE5E,qBACa,oBAAoB;IAE7B,SAAS,CAAC,aAAa,4BAAmC;IAC1D,SAAS,CAAC,eAAe,SAAQ;IAEjC,gBAAgB,CAAC,GAAG,aAAa,EAAE,YAAY,EAAE,GAAG,IAAI;IAgBxD,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAI5C,kBAAkB,IAAI,MAAM;IAI5B,qBAAqB,CAAC,GAAG,CAAC,EAAE,OAAO,GAAG,YAAY,EAAE;IAepD,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,YAAY;CAQrD"}
+{"version":3,"file":"localization-provider.d.ts","sourceRoot":"","sources":["../../../src/node/i18n/localization-provider.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE5E,qBACa,oBAAoB;IAE7B,SAAS,CAAC,aAAa,EAAE,YAAY,EAAE,CAAM;IAC7C,SAAS,CAAC,eAAe,SAAQ;IAEjC,gBAAgB,CAAC,GAAG,aAAa,EAAE,YAAY,EAAE,GAAG,IAAI;IAIxD,mBAAmB,CAAC,GAAG,aAAa,EAAE,YAAY,EAAE,GAAG,IAAI;IAS3D,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAI5C,kBAAkB,IAAI,MAAM;IAI5B,qBAAqB,CAAC,GAAG,CAAC,EAAE,OAAO,GAAG,YAAY,EAAE;IAgBpD,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,YAAY;CAcrD"}

package/lib/node/i18n/localization-provider.js

@@ -25,22 +25,18 @@ exports.LocalizationProvider = void 0;
 const inversify_1 = require("inversify");
 let LocalizationProvider = class LocalizationProvider {
     constructor() {
-        this.localizations = new Map();
+        this.localizations = [];
         this.currentLanguage = 'en';
     }
     addLocalizations(...localizations) {
+        this.localizations.push(...localizations);
+    }
+    removeLocalizations(...localizations) {
         for (const localization of localizations) {
-            let merged = this.localizations.get(localization.languageId);
-            if (!merged) {
-                this.localizations.set(localization.languageId, merged = {
-                    languageId: localization.languageId,
-                    translations: {}
-                });
+            const index = this.localizations.indexOf(localization);
+            if (index >= 0) {
+                this.localizations.splice(index, 1);
             }
-            merged.languageName = merged.languageName || localization.languageName;
-            merged.localizedLanguageName = merged.localizedLanguageName || localization.localizedLanguageName;
-            merged.languagePack = merged.languagePack || localization.languagePack;
-            Object.assign(merged.translations, localization.translations);
         }
     }
     setCurrentLanguage(languageId) {
@@ -50,25 +46,33 @@ let LocalizationProvider = class LocalizationProvider {
         return this.currentLanguage;
     }
     getAvailableLanguages(all) {
-        const languageIds = [];
+        var _a;
+        const languageInfos = new Map();
         for (const localization of this.localizations.values()) {
             if (all || localization.languagePack) {
-                languageIds.push({
-                    languageId: localization.languageId,
-                    languageName: localization.languageName,
-                    languagePack: localization.languagePack,
-                    localizedLanguageName: localization.localizedLanguageName
-                });
+                const languageInfo = (_a = languageInfos.get(localization.languageId)) !== null && _a !== void 0 ? _a : {
+                    languageId: localization.languageId
+                };
+                languageInfo.languageName || (languageInfo.languageName = localization.languageName);
+                languageInfo.localizedLanguageName || (languageInfo.localizedLanguageName = localization.localizedLanguageName);
+                languageInfo.languagePack || (languageInfo.languagePack = localization.languagePack);
+                languageInfos.set(localization.languageId, languageInfo);
             }
         }
-        return languageIds.sort((a, b) => a.languageId.localeCompare(b.languageId));
+        return Array.from(languageInfos.values()).sort((a, b) => a.languageId.localeCompare(b.languageId));
     }
     loadLocalization(languageId) {
-        return this.localizations.get(languageId) ||
-            {
-                languageId,
-                translations: {}
-            };
+        const merged = {
+            languageId,
+            translations: {}
+        };
+        for (const localization of this.localizations.filter(e => e.languageId === languageId)) {
+            merged.languageName || (merged.languageName = localization.languageName);
+            merged.localizedLanguageName || (merged.localizedLanguageName = localization.localizedLanguageName);
+            merged.languagePack || (merged.languagePack = localization.languagePack);
+            Object.assign(merged.translations, localization.translations);
+        }
+        return merged;
     }
 };
 LocalizationProvider = __decorate([

package/lib/node/i18n/localization-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"localization-provider.js","sourceRoot":"","sources":["../../../src/node/i18n/localization-provider.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;AAEhF,yCAAuC;AAIvC,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAAjC;QAEc,kBAAa,GAAG,IAAI,GAAG,EAAwB,CAAC;QAChD,oBAAe,GAAG,IAAI,CAAC;IAiDrC,CAAC;IA/CG,gBAAgB,CAAC,GAAG,aAA6B;QAC7C,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;YACtC,IAAI,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YAC7D,IAAI,CAAC,MAAM,EAAE;gBACT,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG;oBACrD,UAAU,EAAE,YAAY,CAAC,UAAU;oBACnC,YAAY,EAAE,EAAE;iBACnB,CAAC,CAAC;aACN;YACD,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,YAAY,CAAC,YAAY,CAAC;YACvE,MAAM,CAAC,qBAAqB,GAAG,MAAM,CAAC,qBAAqB,IAAI,YAAY,CAAC,qBAAqB,CAAC;YAClG,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,YAAY,CAAC,YAAY,CAAC;YACvE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,YAAY,CAAC,CAAC;SACjE;IACL,CAAC;IAED,kBAAkB,CAAC,UAAkB;QACjC,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC;IACtC,CAAC;IAED,kBAAkB;QACd,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IAED,qBAAqB,CAAC,GAAa;QAC/B,MAAM,WAAW,GAAmB,EAAE,CAAC;QACvC,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE;YACpD,IAAI,GAAG,IAAI,YAAY,CAAC,YAAY,EAAE;gBAClC,WAAW,CAAC,IAAI,CAAC;oBACb,UAAU,EAAE,YAAY,CAAC,UAAU;oBACnC,YAAY,EAAE,YAAY,CAAC,YAAY;oBACvC,YAAY,EAAE,YAAY,CAAC,YAAY;oBACvC,qBAAqB,EAAE,YAAY,CAAC,qBAAqB;iBAC5D,CAAC,CAAC;aACN;SACJ;QACD,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IAChF,CAAC;IAED,gBAAgB,CAAC,UAAkB;QAC/B,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC;YACzC;gBACI,UAAU;gBACV,YAAY,EAAE,EAAE;aACnB,CAAC;IACN,CAAC;CAEJ,CAAA;AApDY,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CAoDhC;AApDY,oDAAoB"}
+{"version":3,"file":"localization-provider.js","sourceRoot":"","sources":["../../../src/node/i18n/localization-provider.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/core",
-  "version": "1.27.0",
+  "version": "1.28.0-next.10+69a4daf82ac",
   "description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
@@ -16,8 +16,8 @@
     "@phosphor/signaling": "1",
     "@phosphor/virtualdom": "1",
     "@phosphor/widgets": "1",
-    "@theia/application-package": "1.27.0",
-    "@theia/request": "1.27.0",
+    "@theia/application-package": "1.28.0-next.10+69a4daf82ac",
+    "@theia/request": "1.28.0-next.10+69a4daf82ac",
     "@types/body-parser": "^1.16.4",
     "@types/cookie": "^0.3.3",
     "@types/dompurify": "^2.2.2",
@@ -200,5 +200,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "b952ad743a97821dee94787e946f5a288174d4e8"
+  "gitHead": "69a4daf82ac07c1dd1cdecb3d97e6444327a445f"
 }

package/src/browser/preloader.ts

@@ -18,6 +18,7 @@ import { nls } from '../common/nls';
 import { Endpoint } from './endpoint';
 import { OS } from '../common/os';
 import { DEFAULT_BACKGROUND_COLOR_STORAGE_KEY, FrontendApplicationConfigProvider } from './frontend-application-config-provider';
+import { Localization } from '../common/i18n/localization';
 
 function fetchFrom(path: string): Promise<Response> {
     const endpoint = new Endpoint({ path }).getRestUrl().toString();
@@ -33,7 +34,16 @@ async function loadTranslations(): Promise<void> {
     }
     if (nls.locale) {
         const response = await fetchFrom(`/i18n/${nls.locale}`);
-        nls.localization = await response.json();
+        const localization = await response.json() as Localization;
+        if (localization.languagePack) {
+            nls.localization = localization;
+        } else {
+            // In case the localization that we've loaded doesn't localize Theia completely (languagePack is false)
+            // We simply reset the locale to the default again
+            Object.assign(nls, {
+                locale: defaultLocale || undefined
+            });
+        }
     }
 }
 

package/src/common/color.ts

@@ -85,7 +85,10 @@ export interface HSLA {
 export interface ColorDefaults {
     light?: Color
     dark?: Color
+    /** @deprecated @since 1.28.0 Please use hcDark and hcLight. This field will be ignored unless `hcDark` is absent. */
     hc?: Color
+    hcDark?: Color;
+    hcLight?: Color;
 }
 
 export interface ColorDefinition {

package/src/common/message-rpc/rpc-message-encoder.ts

@@ -92,17 +92,18 @@ export enum ObjectType {
     JSON = 0,
     ByteArray = 1,
     ObjectArray = 2,
-    Undefined = 3,
-    Object = 4,
-    String = 5,
-    Boolean = 6,
-    Number = 7,
+    Null = 3,
+    Undefined = 4,
+    Object = 5,
+    String = 6,
+    Boolean = 7,
+    Number = 8,
     // eslint-disable-next-line @typescript-eslint/no-shadow
-    ResponseError = 8,
-    Error = 9,
-    Map = 10,
-    Set = 11,
-    Function = 12
+    ResponseError = 9,
+    Error = 10,
+    Map = 11,
+    Set = 12,
+    Function = 13
 
 }
 
@@ -110,7 +111,7 @@ export enum ObjectType {
  * A value encoder writes javascript values to a write buffer. Encoders will be asked
  * in turn (ordered by their tag value, descending) whether they can encode a given value
  * This means encoders with higher tag values have priority. Since the default encoders
- * have tag values from 1-12, they can be easily overridden.
+ * have tag values from 1-13, they can be easily overridden.
  */
 export interface ValueEncoder {
     /**
@@ -200,6 +201,11 @@ export class RpcMessageDecoder {
             read: () => undefined
         });
 
+        this.registerDecoder(ObjectType.Null, {
+            // eslint-disable-next-line no-null/no-null
+            read: () => null
+        });
+
         this.registerDecoder(ObjectType.Object, {
             read: (buf, recursiveRead) => {
                 const propertyCount = buf.readLength();
@@ -429,9 +435,14 @@ export class RpcMessageEncoder {
             write: (buf, value: Set<any>, visitedObjects) => this.writeArray(buf, [...value], visitedObjects)
         });
 
-        this.registerEncoder(ObjectType.Undefined, {
+        this.registerEncoder(ObjectType.Null, {
             // eslint-disable-next-line no-null/no-null
-            is: value => value == null,
+            is: value => value === null,
+            write: () => { }
+        });
+
+        this.registerEncoder(ObjectType.Undefined, {
+            is: value => value === undefined,
             write: () => { }
         });
 

package/src/common/types.ts

@@ -128,6 +128,40 @@ export namespace ArrayUtils {
         RightBeforeLeft = 1,
         Equal = 0,
     }
+
+    // Copied from https://github.com/microsoft/vscode/blob/9c29becfad5f68270b9b23efeafb147722c5feba/src/vs/base/common/arrays.ts
+    /**
+     * Performs a binary search algorithm over a sorted collection. Useful for cases
+     * when we need to perform a binary search over something that isn't actually an
+     * array, and converting data to an array would defeat the use of binary search
+     * in the first place.
+     *
+     * @param length The collection length.
+     * @param compareToKey A function that takes an index of an element in the
+     *   collection and returns zero if the value at this index is equal to the
+     *   search key, a negative number if the value precedes the search key in the
+     *   sorting order, or a positive number if the search key precedes the value.
+     * @return A non-negative index of an element, if found. If not found, the
+     *   result is -(n+1) (or ~n, using bitwise notation), where n is the index
+     *   where the key should be inserted to maintain the sorting order.
+     */
+    export function binarySearch2(length: number, compareToKey: (index: number) => number): number {
+        let low = 0;
+        let high = length - 1;
+
+        while (low <= high) {
+            const mid = ((low + high) / 2) | 0;
+            const comp = compareToKey(mid);
+            if (comp < 0) {
+                low = mid + 1;
+            } else if (comp > 0) {
+                high = mid - 1;
+            } else {
+                return mid;
+            }
+        }
+        return -(low + 1);
+    }
 }
 
 /**

package/src/node/i18n/localization-provider.ts

@@ -20,22 +20,19 @@ import { LanguageInfo, Localization } from '../../common/i18n/localization';
 @injectable()
 export class LocalizationProvider {
 
-    protected localizations = new Map<string, Localization>();
+    protected localizations: Localization[] = [];
     protected currentLanguage = 'en';
 
     addLocalizations(...localizations: Localization[]): void {
+        this.localizations.push(...localizations);
+    }
+
+    removeLocalizations(...localizations: Localization[]): void {
         for (const localization of localizations) {
-            let merged = this.localizations.get(localization.languageId);
-            if (!merged) {
-                this.localizations.set(localization.languageId, merged = {
-                    languageId: localization.languageId,
-                    translations: {}
-                });
+            const index = this.localizations.indexOf(localization);
+            if (index >= 0) {
+                this.localizations.splice(index, 1);
             }
-            merged.languageName = merged.languageName || localization.languageName;
-            merged.localizedLanguageName = merged.localizedLanguageName || localization.localizedLanguageName;
-            merged.languagePack = merged.languagePack || localization.languagePack;
-            Object.assign(merged.translations, localization.translations);
         }
     }
 
@@ -48,26 +45,33 @@ export class LocalizationProvider {
     }
 
     getAvailableLanguages(all?: boolean): LanguageInfo[] {
-        const languageIds: LanguageInfo[] = [];
+        const languageInfos = new Map<string, LanguageInfo>();
         for (const localization of this.localizations.values()) {
             if (all || localization.languagePack) {
-                languageIds.push({
-                    languageId: localization.languageId,
-                    languageName: localization.languageName,
-                    languagePack: localization.languagePack,
-                    localizedLanguageName: localization.localizedLanguageName
-                });
+                const languageInfo = languageInfos.get(localization.languageId) ?? {
+                    languageId: localization.languageId
+                };
+                languageInfo.languageName ||= localization.languageName;
+                languageInfo.localizedLanguageName ||= localization.localizedLanguageName;
+                languageInfo.languagePack ||= localization.languagePack;
+                languageInfos.set(localization.languageId, languageInfo);
             }
         }
-        return languageIds.sort((a, b) => a.languageId.localeCompare(b.languageId));
+        return Array.from(languageInfos.values()).sort((a, b) => a.languageId.localeCompare(b.languageId));
     }
 
     loadLocalization(languageId: string): Localization {
-        return this.localizations.get(languageId) ||
-        {
+        const merged: Localization = {
             languageId,
             translations: {}
         };
+        for (const localization of this.localizations.filter(e => e.languageId === languageId)) {
+            merged.languageName ||= localization.languageName;
+            merged.localizedLanguageName ||= localization.localizedLanguageName;
+            merged.languagePack ||= localization.languagePack;
+            Object.assign(merged.translations, localization.translations);
+        }
+        return merged;
     }
 
 }