@theia/plugin-ext 1.28.0 → 1.29.0-next.11

package/src/plugin/preference-registry.ts

@@ -17,17 +17,20 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { Emitter, Event } from '@theia/core/lib/common/event';
+import { URI } from '@theia/core/shared/vscode-uri';
+import { ResourceMap } from '@theia/monaco-editor-core/esm/vs/base/common/map';
+import { IConfigurationOverrides, IOverrides } from '@theia/monaco-editor-core/esm/vs/platform/configuration/common/configuration';
+import { Configuration, ConfigurationModel } from '@theia/monaco-editor-core/esm/vs/platform/configuration/common/configurationModels';
+import { Workspace, WorkspaceFolder } from '@theia/monaco-editor-core/esm/vs/platform/workspace/common/workspace';
 import * as theia from '@theia/plugin';
+import { platform } from 'os';
+import { v4 } from 'uuid';
 import {
-    PLUGIN_RPC_CONTEXT,
-    PreferenceRegistryExt,
-    PreferenceRegistryMain,
-    PreferenceData,
-    PreferenceChangeExt
+    PLUGIN_RPC_CONTEXT, PreferenceChangeExt, PreferenceData, PreferenceRegistryExt,
+    PreferenceRegistryMain
 } from '../common/plugin-api-rpc';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { isObject, mixin } from '../common/types';
-import { Configuration, ConfigurationModel } from './preferences/configuration';
 import { WorkspaceExtImpl } from './workspace';
 import cloneDeep = require('lodash.clonedeep');
 
@@ -35,14 +38,14 @@ const injectionRe = /\b__proto__\b|\bconstructor\.prototype\b/;
 
 enum ConfigurationTarget {
     Global = 1,
-    Workspace = 2,
-    WorkspaceFolder = 3
+    Workspace = 2, // eslint-disable-line @typescript-eslint/no-shadow
+    WorkspaceFolder = 3 // eslint-disable-line @typescript-eslint/no-shadow
 }
 
-enum PreferenceScope {
+export enum PreferenceScope {
     Default,
     User,
-    Workspace,
+    Workspace, // eslint-disable-line @typescript-eslint/no-shadow
     Folder,
 }
 
@@ -68,6 +71,13 @@ function lookUp(tree: any, key: string): any {
     return node;
 }
 
+export class TheiaWorkspace extends Workspace {
+    constructor(ext: WorkspaceExtImpl) {
+        const folders = (ext.workspaceFolders ?? []).map(folder => new WorkspaceFolder(folder));
+        super(v4(), folders, false, ext.workspaceFile ?? null, () => ['win32', 'darwin'].includes(platform()));
+    }
+}
+
 export class PreferenceRegistryExtImpl implements PreferenceRegistryExt {
     private proxy: PreferenceRegistryMain;
     private _preferences: Configuration;
@@ -91,11 +101,11 @@ export class PreferenceRegistryExtImpl implements PreferenceRegistryExt {
         this._onDidChangeConfiguration.fire(this.toConfigurationChangeEvent(eventData));
     }
 
-    getConfiguration(section?: string, resource?: theia.Uri | null, extensionId?: string): theia.WorkspaceConfiguration {
-        resource = resource === null ? undefined : resource;
-        const preferences = this.toReadonlyValue(section
-            ? lookUp(this._preferences.getValue(undefined, this.workspace, resource), section)
-            : this._preferences.getValue(undefined, this.workspace, resource));
+    getConfiguration(rawSection?: string, rawScope?: theia.ConfigurationScope | null, extensionId?: string): theia.WorkspaceConfiguration {
+        const overrides = this.parseConfigurationAccessOptions(rawScope);
+
+        const preferences = this.toReadonlyValue(
+            this._preferences.getValue(rawSection, overrides, new TheiaWorkspace(this.workspace)));
 
         const configuration: theia.WorkspaceConfiguration = {
             has(key: string): boolean {
@@ -119,6 +129,11 @@ export class PreferenceRegistryExtImpl implements PreferenceRegistryExt {
                         }
                         return new Proxy(target, {
                             get: (targ: any, prop: string) => {
+                                const config = Object.getOwnPropertyDescriptor(targ, prop);
+                                // This check ensures that https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy/Proxy/get#invariants are satisfied
+                                if (config?.configurable === false && config?.writable === false) {
+                                    return targ[prop];
+                                }
                                 if (typeof prop === 'string' && prop.toLowerCase() === 'tojson') {
                                     cloneTarget();
                                     return () => clonedTarget;
@@ -153,37 +168,28 @@ export class PreferenceRegistryExtImpl implements PreferenceRegistryExt {
                     return cloneOnWriteProxy(result, key);
                 }
             },
-            update: (key: string, value: any, arg?: ConfigurationTarget | boolean): PromiseLike<void> => {
-                key = section ? `${section}.${key}` : key;
-                const resourceStr: string | undefined = resource ? resource.toString() : undefined;
+            update: (key: string, value: any, targetScope?: ConfigurationTarget | boolean, withLanguageOverride?: boolean): PromiseLike<void> => {
+                const resourceStr = overrides.resource?.toString();
+                const fullPath = `${overrides.overrideIdentifier ? `[${overrides.overrideIdentifier}].` : ''}${rawSection}.${key}`;
                 if (typeof value !== 'undefined') {
-                    return this.proxy.$updateConfigurationOption(arg, key, value, resourceStr);
+                    return this.proxy.$updateConfigurationOption(targetScope, fullPath, value, resourceStr, withLanguageOverride);
                 } else {
-                    return this.proxy.$removeConfigurationOption(arg, key, resourceStr);
+                    return this.proxy.$removeConfigurationOption(targetScope, fullPath, resourceStr, withLanguageOverride);
                 }
             },
             inspect: <T>(key: string): ConfigurationInspect<T> | undefined => {
-                key = section ? `${section}.${key}` : key;
-                resource = resource === null ? undefined : resource;
-                const result = cloneDeep(this._preferences.inspect<T>(key, this.workspace, resource));
+                const path = `${rawSection}.${key}`;
+                const result = this._preferences.inspect<T>(path, overrides, new TheiaWorkspace(this.workspace));
 
                 if (!result) {
                     return undefined;
                 }
 
                 const configInspect: ConfigurationInspect<T> = { key };
-                if (typeof result.default !== 'undefined') {
-                    configInspect.defaultValue = result.default;
-                }
-                if (typeof result.user !== 'undefined') {
-                    configInspect.globalValue = result.user;
-                }
-                if (typeof result.workspace !== 'undefined') {
-                    configInspect.workspaceValue = result.workspace;
-                }
-                if (typeof result.workspaceFolder !== 'undefined') {
-                    configInspect.workspaceFolderValue = result.workspaceFolder;
-                }
+                configInspect.defaultValue = result.default?.value;
+                configInspect.globalValue = result.user?.value;
+                configInspect.workspaceValue = result.workspace?.value;
+                configInspect.workspaceFolderValue = result.workspaceFolder?.value;
                 return configInspect;
             }
         };
@@ -198,7 +204,14 @@ export class PreferenceRegistryExtImpl implements PreferenceRegistryExt {
     private toReadonlyValue(data: any): any {
         const readonlyProxy = (target: any): any => isObject(target)
             ? new Proxy(target, {
-                get: (targ: any, prop: string) => readonlyProxy(targ[prop]),
+                get: (targ: any, prop: string) => {
+                    const config = Object.getOwnPropertyDescriptor(targ, prop);
+                    // This check ensures that https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy/Proxy/get#invariants are satisfied
+                    if (config?.configurable === false && config?.writable === false) {
+                        return targ[prop];
+                    }
+                    return readonlyProxy(targ[prop]);
+                },
                 set: (targ: any, prop: string, val: any) => {
                     throw new Error(`TypeError: Cannot assign to read only property '${prop}' of object`);
                 },
@@ -222,70 +235,93 @@ export class PreferenceRegistryExtImpl implements PreferenceRegistryExt {
         const defaultConfiguration = this.getConfigurationModel(data[PreferenceScope.Default]);
         const userConfiguration = this.getConfigurationModel(data[PreferenceScope.User]);
         const workspaceConfiguration = this.getConfigurationModel(data[PreferenceScope.Workspace]);
-        const folderConfigurations = {} as { [resource: string]: ConfigurationModel };
+        const folderConfigurations = new ResourceMap<ConfigurationModel>();
         Object.keys(data[PreferenceScope.Folder]).forEach(resource => {
-            folderConfigurations[resource] = this.getConfigurationModel(data[PreferenceScope.Folder][resource]);
+            folderConfigurations.set(URI.parse(resource), this.getConfigurationModel(data[PreferenceScope.Folder][resource]));
         });
-        return new Configuration(defaultConfiguration, userConfiguration, workspaceConfiguration, folderConfigurations);
+        return new Configuration(defaultConfiguration, userConfiguration, undefined, workspaceConfiguration, folderConfigurations);
     }
 
     private getConfigurationModel(data: { [key: string]: any }): ConfigurationModel {
         if (!data) {
             return new ConfigurationModel();
         }
-        return new ConfigurationModel(this.parseConfigurationData(data), Object.keys(data));
+        const configData = this.parseConfigurationData(data);
+        return new ConfigurationModel(configData.contents, configData.keys, configData.overrides);
     }
 
-    private readonly OVERRIDE_PROPERTY = '\\[(.*)\\]$';
+    private readonly OVERRIDE_PROPERTY = '^\\[(.*)\\]$';
     private readonly OVERRIDE_PROPERTY_PATTERN = new RegExp(this.OVERRIDE_PROPERTY);
+    private readonly OVERRIDE_KEY_TEST = /^\[([^\]]+)\]\./;
 
-    private parseConfigurationData(data: { [key: string]: any }): { [key: string]: any } {
-        return Object.keys(data).reduce((result: any, key: string) => {
+    private parseConfigurationData(data: { [key: string]: any }): Omit<IOverrides, 'identifiers'> & { overrides: IOverrides[] } {
+        const keys = new Array<string>();
+        const overrides: Record<string, IOverrides> = Object.create(null);
+        const contents = Object.keys(data).reduce((result: any, key: string) => {
             if (injectionRe.test(key)) {
                 return result;
             }
             const parts = key.split('.');
             let branch = result;
-
+            const isOverride = this.OVERRIDE_KEY_TEST.test(key);
+            if (!isOverride) {
+                keys.push(key);
+            }
             for (let i = 0; i < parts.length; i++) {
-                if (i === parts.length - 1) {
+                if (i === 0 && isOverride) {
+                    const identifier = this.OVERRIDE_PROPERTY_PATTERN.exec(parts[i])![1];
+                    if (!overrides[identifier]) {
+                        overrides[identifier] = { keys: [], identifiers: [identifier], contents: Object.create(null) };
+                    }
+                    branch = overrides[identifier].contents;
+                    overrides[identifier].keys.push(key.slice(parts[i].length + 1));
+                } else if (i === parts.length - 1) {
                     branch[parts[i]] = data[key];
-                    continue;
-                }
-                if (!branch[parts[i]]) {
-                    branch[parts[i]] = Object.create(null);
-                }
-                branch = branch[parts[i]];
-
-                // overridden properties should be transformed into
-                // "[overridden_identifier]" : {
-                //              "property1" : "value1"
-                //              "property2" : "value2"
-                //  }
-                if (i === 0 && this.OVERRIDE_PROPERTY_PATTERN.test(parts[i])) {
-                    branch[key.substring(parts[0].length + 1)] = data[key];
-                    break;
+                } else {
+                    if (!branch[parts[i]]) {
+                        branch[parts[i]] = Object.create(null);
+                    }
+                    branch = branch[parts[i]];
                 }
             }
             return result;
         }, Object.create(null));
+        return { contents, keys, overrides: Object.values(overrides) };
     }
 
     private toConfigurationChangeEvent(eventData: PreferenceChangeExt[]): theia.ConfigurationChangeEvent {
         return Object.freeze({
-            affectsConfiguration: (section: string, uri?: theia.Uri): boolean => {
-                // TODO respect uri
-                // TODO respect scopes shadowing
-                for (const change of eventData) {
-                    const tree = change.preferenceName
-                        .split('.')
-                        .reverse()
-                        .reduce((prevValue: any, curValue: any) => ({ [curValue]: prevValue }), change.newValue);
-                    return typeof lookUp(tree, section) !== 'undefined';
-                }
-                return false;
+            affectsConfiguration: (section: string, scope?: theia.ConfigurationScope): boolean => {
+                const { resource, overrideIdentifier } = this.parseConfigurationAccessOptions(scope);
+                const sectionWithLanguage = overrideIdentifier ? `[${overrideIdentifier}].${section}` : section;
+                return eventData.some(change => {
+                    const matchesUri = !resource || !change.scope || (resource.toString() + '/').startsWith(change.scope.endsWith('/') ? change.scope : change.scope + '/');
+                    const sliceIndex = overrideIdentifier ? 0 : (this.OVERRIDE_KEY_TEST.exec(change.preferenceName)?.[0].length ?? 0);
+                    const changedPreferenceName = sliceIndex ? change.preferenceName.slice(sliceIndex) : change.preferenceName;
+                    return matchesUri && (
+                        sectionWithLanguage === changedPreferenceName
+                        || sectionWithLanguage.startsWith(`${changedPreferenceName}.`)
+                        || changedPreferenceName.startsWith(`${sectionWithLanguage}.`));
+                });
             }
         });
     }
 
+    protected parseConfigurationAccessOptions(scope?: theia.ConfigurationScope | null): IConfigurationOverrides {
+        if (!scope) {
+            return {};
+        }
+        let overrideIdentifier: string | undefined = undefined;
+        let resource: theia.Uri | undefined;
+        if ('uri' in scope || 'languageId' in scope) {
+            resource = scope.uri;
+        } else {
+            resource = scope;
+        }
+        if ('languageId' in scope) {
+            overrideIdentifier = scope.languageId;
+        }
+        return { resource, overrideIdentifier };
+    }
+
 }

package/src/plugin/type-converters.ts

@@ -137,9 +137,8 @@ export function toPosition(position: Position): types.Position {
     return new types.Position(position.lineNumber - 1, position.column - 1);
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function isDecorationOptions(something: any): something is theia.DecorationOptions {
-    return (typeof something.range !== 'undefined');
+function isDecorationOptions(arg: unknown): arg is theia.DecorationOptions {
+    return !!arg && typeof arg === 'object' && typeof (arg as theia.DecorationOptions).range !== 'undefined';
 }
 
 export function isDecorationOptionsArr(something: theia.Range[] | theia.DecorationOptions[]): something is theia.DecorationOptions[] {
@@ -182,11 +181,10 @@ interface Codeblock {
     value: string;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function isCodeblock(thing: any): thing is Codeblock {
-    return thing && typeof thing === 'object'
-        && typeof (<Codeblock>thing).language === 'string'
-        && typeof (<Codeblock>thing).value === 'string';
+function isCodeblock(arg: unknown): arg is Codeblock {
+    return !!arg && typeof arg === 'object'
+        && typeof (arg as Codeblock).language === 'string'
+        && typeof (arg as Codeblock).value === 'string';
 }
 
 export function fromMarkdown(markup: theia.MarkdownString | theia.MarkedString): MarkdownStringDTO {
@@ -396,6 +394,13 @@ export function fromHover(hover: theia.Hover): model.Hover {
     };
 }
 
+export function fromEvaluatableExpression(evaluatableExpression: theia.EvaluatableExpression): model.EvaluatableExpression {
+    return <model.EvaluatableExpression>{
+        range: fromRange(evaluatableExpression.range),
+        expression: evaluatableExpression.expression
+    };
+}
+
 export function fromLocation(location: theia.Location): model.Location {
     return <model.Location>{
         uri: location.uri,
@@ -618,64 +623,58 @@ export function toSymbolTag(kind: model.SymbolTag): types.SymbolTag {
     }
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function isModelLocation(thing: any): thing is model.Location {
-    if (!thing) {
-        return false;
-    }
-    return isModelRange((<model.Location>thing).range) &&
-        isUriComponents((<model.Location>thing).uri);
-}
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function isModelRange(thing: any): thing is model.Range {
-    if (!thing) {
-        return false;
-    }
-    return (('startLineNumber' in thing) && typeof thing.startLineNumber === 'number') &&
-        (('startColumn' in thing) && typeof thing.startColumn === 'number') &&
-        (('endLineNumber' in thing) && typeof thing.endLineNumber === 'number') &&
-        (('endColumn' in thing) && typeof thing.endColumn === 'number');
-}
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function isUriComponents(thing: any): thing is UriComponents {
-    if (!thing) {
+export function isModelLocation(arg: unknown): arg is model.Location {
+    if (!arg) {
         return false;
     }
-    return (('scheme' in thing) && typeof thing.scheme === 'string') &&
-        (('path' in thing) && typeof thing.path === 'string') &&
-        (('query' in thing) && typeof thing.query === 'string') &&
-        (('fragment' in thing) && typeof thing.fragment === 'string');
+    return !!arg &&
+        typeof arg === 'object' &&
+        isModelRange((arg as model.Location).range) &&
+        isUriComponents((arg as model.Location).uri);
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function isModelCallHierarchyItem(thing: any): thing is model.CallHierarchyItem {
-    if (!thing) {
-        return false;
-    }
-    return isModelRange(thing.range)
-        && isModelRange(thing.selectionRange)
-        && isUriComponents(thing.uri)
-        && !!thing.name;
+export function isModelRange(arg: unknown): arg is model.Range {
+    const range = arg as model.Range;
+    return !!arg && typeof arg === 'object' &&
+        typeof range.startLineNumber === 'number' &&
+        typeof range.startColumn === 'number' &&
+        typeof range.endLineNumber === 'number' &&
+        typeof range.endColumn === 'number';
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function isModelCallHierarchyIncomingCall(thing: any): thing is model.CallHierarchyIncomingCall {
-    if (!thing) {
-        return false;
-    }
-    const maybeIncomingCall = thing as model.CallHierarchyIncomingCall;
-    return 'from' in maybeIncomingCall && 'fromRanges' in maybeIncomingCall && isModelCallHierarchyItem(maybeIncomingCall.from);
-}
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function isModelCallHierarchyOutgoingCall(thing: any): thing is model.CallHierarchyOutgoingCall {
-    if (!thing) {
-        return false;
-    }
-    const maybeOutgoingCall = thing as model.CallHierarchyOutgoingCall;
-    return 'to' in maybeOutgoingCall && 'fromRanges' in maybeOutgoingCall && isModelCallHierarchyItem(maybeOutgoingCall.to);
+export function isUriComponents(arg: unknown): arg is UriComponents {
+    const uriComponents = arg as UriComponents;
+    return !!arg && typeof arg === 'object' &&
+        typeof uriComponents.scheme === 'string' &&
+        typeof uriComponents.path === 'string' &&
+        typeof uriComponents.query === 'string' &&
+        typeof uriComponents.fragment === 'string';
+}
+
+export function isModelCallHierarchyItem(arg: unknown): arg is model.CallHierarchyItem {
+    const item = arg as model.CallHierarchyItem;
+    return !!item && typeof item === 'object'
+        && isModelRange(item.range)
+        && isModelRange(item.selectionRange)
+        && isUriComponents(item.uri)
+        && !!item.name;
+}
+
+export function isModelCallHierarchyIncomingCall(arg: unknown): arg is model.CallHierarchyIncomingCall {
+    const maybeIncomingCall = arg as model.CallHierarchyIncomingCall;
+    return !!arg && typeof arg === 'object' &&
+        'from' in maybeIncomingCall &&
+        'fromRanges' in maybeIncomingCall &&
+        isModelCallHierarchyItem(maybeIncomingCall.from);
+}
+
+export function isModelCallHierarchyOutgoingCall(arg: unknown): arg is model.CallHierarchyOutgoingCall {
+    const maybeOutgoingCall = arg as model.CallHierarchyOutgoingCall;
+    return !!arg && typeof arg === 'object' &&
+        'to' in maybeOutgoingCall &&
+        'fromRanges' in maybeOutgoingCall &&
+        isModelCallHierarchyItem(maybeOutgoingCall.to);
 }
 
 export function toLocation(value: model.Location): types.Location {

package/src/plugin/types-impl.ts

@@ -20,7 +20,6 @@
 *--------------------------------------------------------------------------------------------*/
 
 /* eslint-disable no-null/no-null */
-/* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { UUID } from '@theia/core/shared/@phosphor/coreutils';
 import { illegalArgument } from '../common/errors';
@@ -38,6 +37,7 @@ import { es5ClassCompat } from '../common/types';
  * A reviver that takes URI's transferred via JSON.stringify() and makes
  * instances of our local plugin API URI class (below)
  */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function reviver(key: string | undefined, value: any): any {
     const revived = ObjectsTransferrer.reviver(key, value);
     if (CodeURI.isUri(revived)) {
@@ -423,7 +423,7 @@ export class Position {
         return false;
     }
 
-    toJSON(): any {
+    toJSON(): unknown {
         return { line: this.line, character: this.character };
     }
 }
@@ -546,19 +546,17 @@ export class Range {
         return new Range(start, end);
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    static isRange(thing: any): thing is theia.Range {
+    static isRange(thing: unknown): thing is theia.Range {
         if (thing instanceof Range) {
             return true;
         }
-        if (!thing) {
-            return false;
-        }
-        return Position.isPosition((<Range>thing).start)
-            && Position.isPosition((<Range>thing).end);
+        const range = thing as theia.Range;
+        return !!thing && typeof thing === 'object'
+            && Position.isPosition(range.start)
+            && Position.isPosition(range.end);
     }
 
-    toJSON(): any {
+    toJSON(): unknown {
         return [this.start, this.end];
     }
 }
@@ -1119,6 +1117,24 @@ export class Hover {
     }
 }
 
+@es5ClassCompat
+export class EvaluatableExpression {
+
+    public range: Range;
+    public expression?: string;
+
+    constructor(
+        range: Range,
+        expression?: string
+    ) {
+        if (!range) {
+            illegalArgument('range must be defined');
+        }
+        this.range = range;
+        this.expression = expression;
+    }
+}
+
 export enum DocumentHighlightKind {
     Text = 0,
     Read = 1,
@@ -1618,8 +1634,8 @@ export class FileSystemError extends Error {
 
         // workaround when extending builtin objects and when compiling to ES5, see:
         // https://github.com/Microsoft/TypeScript-wiki/blob/master/Breaking-Changes.md#extending-built-ins-like-error-array-and-map-may-no-longer-work
-        if (typeof (<any>Object).setPrototypeOf === 'function') {
-            (<any>Object).setPrototypeOf(this, FileSystemError.prototype);
+        if (typeof Object.setPrototypeOf === 'function') {
+            Object.setPrototypeOf(this, FileSystemError.prototype);
         }
 
         if (typeof Error.captureStackTrace === 'function' && typeof terminator === 'function') {
@@ -2537,7 +2553,7 @@ export class SemanticTokensLegend {
     }
 }
 
-function isStrArrayOrUndefined(arg: any): arg is string[] | undefined {
+function isStrArrayOrUndefined(arg: unknown): arg is string[] | undefined {
     return ((typeof arg === 'undefined') || (Array.isArray(arg) && arg.every(e => typeof e === 'string')));
 }
 
@@ -2575,7 +2591,7 @@ export class SemanticTokensBuilder {
 
     public push(line: number, char: number, length: number, tokenType: number, tokenModifiers?: number): void;
     public push(range: Range, tokenType: string, tokenModifiers?: string[]): void;
-    public push(arg0: any, arg1: any, arg2: any, arg3?: any, arg4?: any): void {
+    public push(arg0: number | Range, arg1: number | string, arg2?: number | string[], arg3?: number, arg4?: number): void {
         if (typeof arg0 === 'number' && typeof arg1 === 'number' && typeof arg2 === 'number' && typeof arg3 === 'number' &&
             (typeof arg4 === 'number' || typeof arg4 === 'undefined')) {
             if (typeof arg4 === 'undefined') {

package/lib/plugin/preferences/configuration.d.ts

@@ -1,35 +0,0 @@
-import { WorkspaceExtImpl } from '../workspace';
-import { URI } from '@theia/core/shared/vscode-uri';
-export declare class Configuration {
-    private defaultConfiguration;
-    private userConfiguration;
-    private workspaceConfiguration;
-    private folderConfigurations;
-    private combinedConfig;
-    private folderCombinedConfigs;
-    constructor(defaultConfiguration: ConfigurationModel, userConfiguration: ConfigurationModel, workspaceConfiguration?: ConfigurationModel, folderConfigurations?: {
-        [resource: string]: ConfigurationModel;
-    });
-    getValue(section: string | undefined, workspace: WorkspaceExtImpl, resource?: URI): any;
-    inspect<C>(key: string, workspace: WorkspaceExtImpl, resource?: URI): {
-        default: C;
-        user: C;
-        workspace: C | undefined;
-        workspaceFolder: C | undefined;
-        value: C;
-    };
-    private getCombinedResourceConfig;
-    private getCombinedConfig;
-    private getFolderCombinedConfig;
-    private getFolderResourceConfig;
-}
-export declare class ConfigurationModel {
-    private contents;
-    private keys;
-    constructor(contents?: any, keys?: string[]);
-    getValue(section?: string): any;
-    merge(...others: ConfigurationModel[]): ConfigurationModel;
-    private mergeContents;
-    private mergeKeys;
-}
-//# sourceMappingURL=configuration.d.ts.map

package/lib/plugin/preferences/configuration.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../src/plugin/preferences/configuration.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGhD,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAC;AAIpD,qBAAa,aAAa;IAMlB,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,oBAAoB;IAPhC,OAAO,CAAC,cAAc,CAAiC;IACvD,OAAO,CAAC,qBAAqB,CAAkD;gBAGnE,oBAAoB,EAAE,kBAAkB,EACxC,iBAAiB,EAAE,kBAAkB,EACrC,sBAAsB,GAAE,kBAA6C,EACrE,oBAAoB,GAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,kBAAkB,CAAA;KAAO;IAGjF,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE,GAAG,GAAG,GAAG;IAIvF,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE,GAAG,GAAG;QAClE,OAAO,EAAE,CAAC,CAAC;QACX,IAAI,EAAE,CAAC,CAAC;QACR,SAAS,EAAE,CAAC,GAAG,SAAS,CAAC;QACzB,eAAe,EAAE,CAAC,GAAG,SAAS,CAAC;QAC/B,KAAK,EAAE,CAAC,CAAC;KACZ;IAYD,OAAO,CAAC,yBAAyB;IAcjC,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,uBAAuB;IAiB/B,OAAO,CAAC,uBAAuB;CAYlC;AAED,qBAAa,kBAAkB;IAGvB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,IAAI;gBADJ,QAAQ,GAAE,GAAyB,EACnC,IAAI,GAAE,MAAM,EAAO;IAG/B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,GAAG;IAgB/B,KAAK,CAAC,GAAG,MAAM,EAAE,kBAAkB,EAAE,GAAG,kBAAkB;IAW1D,OAAO,CAAC,aAAa;IAerB,OAAO,CAAC,SAAS;CAQpB"}