repo: remove deprecated apis

Signed-off-by: Paul Maréchal <paul.marechal@ericsson.com>

dev-packages/application-package/src/application-package.spec.ts

@@ -35,23 +35,23 @@ describe('application-package', function (): void {
         const warn = sandbox.stub(console, 'warn');
         const root = createProjectWithTarget('foo');
         const applicationPackage = new ApplicationPackage({ projectPath: root });
-        assert.equal(applicationPackage.target, ApplicationProps.ApplicationTarget.browser);
-        assert.equal(warn.called, true);
+        assert.strictEqual(applicationPackage.target, ApplicationProps.ApplicationTarget.browser);
+        assert.strictEqual(warn.called, true);
     });
 
     it('should set target from package.json', function (): void {
         const target = 'electron';
         const root = createProjectWithTarget(target);
         const applicationPackage = new ApplicationPackage({ projectPath: root });
-        assert.equal(applicationPackage.target, target);
+        assert.strictEqual(applicationPackage.target, target);
     });
 
     it('should prefer target from passed options over target from package.json', function (): void {
         const pckTarget = 'electron';
         const optTarget = 'browser';
         const root = createProjectWithTarget(pckTarget);
         const applicationPackage = new ApplicationPackage({ projectPath: root, appTarget: optTarget });
-        assert.equal(applicationPackage.target, optTarget);
+        assert.strictEqual(applicationPackage.target, optTarget);
     });
 
     function createProjectWithTarget(target: string): string {

packages/core/src/browser/common-frontend-contribution.ts

@@ -39,7 +39,7 @@ import { UriSelection } from '../common/selection';
 import { StorageService } from './storage-service';
 import { Navigatable } from './navigatable';
 import { QuickViewService } from './quick-view-service';
-import { PrefixQuickOpenService, QuickOpenItem, QuickOpenMode, QuickOpenService, QuickOpenGroupItem } from './quick-open';
+import { PrefixQuickOpenService, QuickOpenService } from './quick-open';
 import { environment } from '@theia/application-package/lib/environment';
 import { IconThemeService } from './icon-theme-service';
 import { ColorContribution } from './color-application-contribution';
@@ -51,6 +51,7 @@ import { ClipboardService } from './clipboard-service';
 import { EncodingRegistry } from './encoding-registry';
 import { UTF8 } from '../common/encodings';
 import { EnvVariablesServer } from '../common/env-variables';
+import { QuickOpenItem, QuickOpenMode, QuickOpenGroupItem } from '../common/quick-open-model';
 
 export namespace CommonMenus {
 

packages/core/src/browser/context-menu-renderer.ts

@@ -71,12 +71,8 @@ export abstract class ContextMenuRenderer {
         }
     }
 
-    render(options: RenderContextMenuOptions): ContextMenuAccess;
-    /** @deprecated since 0.7.2 pass `RenderContextMenuOptions` instead */
-    render(menuPath: MenuPath, anchor: Anchor, onHide?: () => void): ContextMenuAccess;
-    render(menuPathOrOptions: MenuPath | RenderContextMenuOptions, anchor?: Anchor, onHide?: () => void): ContextMenuAccess {
-        const resolvedOptions = RenderContextMenuOptions.resolve(menuPathOrOptions, anchor, onHide);
-        const access = this.doRender(resolvedOptions);
+    render(options: RenderContextMenuOptions): ContextMenuAccess {
+        const access = this.doRender(options);
         this.setCurrent(access);
         return access;
     }
@@ -91,24 +87,3 @@ export interface RenderContextMenuOptions {
     args?: any[]
     onHide?: () => void
 }
-export namespace RenderContextMenuOptions {
-    export function resolve(menuPathOrOptions: MenuPath | RenderContextMenuOptions, anchor?: Anchor, onHide?: () => void): RenderContextMenuOptions {
-        let menuPath: MenuPath;
-        let args: any[];
-        if (Array.isArray(menuPathOrOptions)) {
-            menuPath = menuPathOrOptions;
-            args = [anchor!];
-        } else {
-            menuPath = menuPathOrOptions.menuPath;
-            anchor = menuPathOrOptions.anchor;
-            onHide = menuPathOrOptions.onHide;
-            args = menuPathOrOptions.args ? [...menuPathOrOptions.args, anchor] : [anchor];
-        }
-        return {
-            menuPath,
-            anchor: anchor!,
-            onHide,
-            args
-        };
-    }
-}

packages/core/src/browser/diff-uris.ts

@@ -81,11 +81,11 @@ export class DiffUriLabelProviderContribution implements LabelProviderContributi
         const [left, right] = DiffUris.decode(uri);
 
         if (left.path.toString() === right.path.toString() && left.query && right.query) {
-            return `${left.displayName}: ${left.query} ⟷ ${right.query}`;
+            return `${this.labelProvider.getName(left)}: ${left.query} ⟷ ${right.query}`;
         } else {
             let title;
-            if (left.path.toString() !== right.path.toString() && left.displayName !== uri.displayName) {
-                title = `${uri.displayName}: `;
+            if (left.path.toString() !== right.path.toString() && this.labelProvider.getName(left) !== this.labelProvider.getName(uri)) {
+                title = `${this.labelProvider.getName(uri)}: `;
             } else {
                 title = '';
             }

packages/core/src/browser/keybinding.spec.ts

@@ -21,7 +21,8 @@ import { Container, injectable, ContainerModule } from 'inversify';
 import { bindContributionProvider } from '../common/contribution-provider';
 import { KeyboardLayoutProvider, NativeKeyboardLayout, KeyboardLayoutChangeNotifier } from '../common/keyboard/keyboard-layout-provider';
 import { ILogger } from '../common/logger';
-import { KeybindingRegistry, KeybindingContext, Keybinding, KeybindingContribution, KeybindingScope } from './keybinding';
+import { KeybindingRegistry, KeybindingContext, KeybindingContribution, KeybindingScope } from './keybinding';
+import { Keybinding } from '../common/keybinding';
 import { KeyCode, Key, KeyModifier, KeySequence } from './keyboard/keys';
 import { KeyboardLayoutService } from './keyboard/keyboard-layout-service';
 import { CommandRegistry, CommandService, CommandContribution, Command } from '../common/command';

packages/core/src/browser/keybinding.ts

@@ -25,7 +25,7 @@ import { ContributionProvider } from '../common/contribution-provider';
 import { ILogger } from '../common/logger';
 import { StatusBarAlignment, StatusBar } from './status-bar/status-bar';
 import { ContextKeyService } from './context-key-service';
-import * as common from '../common/keybinding';
+import { Keybinding } from '../common/keybinding';
 
 export enum KeybindingScope {
     DEFAULT,
@@ -37,12 +37,6 @@ export namespace KeybindingScope {
     export const length = KeybindingScope.END - KeybindingScope.DEFAULT;
 }
 
-/**
- * @deprecated import from `@theia/core/lib/common/keybinding` instead
- */
-export type Keybinding = common.Keybinding;
-export const Keybinding = common.Keybinding;
-
 export interface ResolvedKeybinding extends Keybinding {
     /**
      * The KeyboardLayoutService may transform the `keybinding` depending on the
@@ -261,6 +255,7 @@ export class KeybindingRegistry {
     containsKeybindingInScope(binding: Keybinding, scope = KeybindingScope.USER): boolean {
         const bindingKeySequence = this.resolveKeybinding(binding);
         const collisions = this.getKeySequenceCollisions(this.keymaps[scope], bindingKeySequence)
+            // eslint-disable-next-line deprecation/deprecation
             .filter(b => b.context === binding.context && !b.when && !binding.when);
         if (collisions.full.length > 0) {
             return true;
@@ -437,6 +432,7 @@ export class KeybindingRegistry {
      * Only execute if it has no context (global context) or if we're in that context.
      */
     protected isEnabled(binding: Keybinding, event: KeyboardEvent): boolean {
+        // eslint-disable-next-line deprecation/deprecation
         const context = binding.context && this.contexts[binding.context];
         if (context && !context.isEnabled(binding)) {
             return false;
@@ -532,6 +528,7 @@ export class KeybindingRegistry {
             if (event && !this.isEnabled(binding, event)) {
                 return false;
             }
+            // eslint-disable-next-line deprecation/deprecation
             const { command, context, when, keybinding } = binding;
             if (binding.command.charAt(0) === '-') {
                 disabled = disabled || new Set<string>();

packages/core/src/browser/keyboard/keys.ts

@@ -371,7 +371,7 @@ export namespace KeyCode {
             }
         }
 
-        // tslint:disable-next-line: deprecation
+        // eslint-disable-next-line deprecation/deprecation
         const keyCode = event.keyCode;
         if (keyCode) {
             const key = Key.getKey(keyCode);
@@ -401,6 +401,7 @@ export namespace KeyCode {
         if (key && Array.from(key).length === 1) {
             return key;
         }
+        // eslint-disable-next-line deprecation/deprecation
         const charCode = event.charCode;
         // Use the charCode property if it does not correspond to a unicode control character
         if (charCode && charCode > 0x1f && !(charCode >= 0x80 && charCode <= 0x9f)) {

packages/core/src/browser/label-provider.ts

@@ -33,19 +33,6 @@ const DEFAULT_FOLDER_ICON = 'fa fa-folder';
  */
 const DEFAULT_FILE_ICON = 'fa fa-file';
 
-/**
- * Internal folder icon class for the default (File Icons) theme.
- *
- * @deprecated Use `LabelProvider.folderIcon` to get a folder icon class for the current icon theme.
- */
-export const FOLDER_ICON = DEFAULT_FOLDER_ICON;
-/**
- * Internal file icon class for the default (File Icons) theme.
- *
- * @deprecated Use `LabelProvider.fileIcon` to get a file icon class for the current icon theme.
- */
-export const FILE_ICON = DEFAULT_FILE_ICON;
-
 export const LabelProviderContribution = Symbol('LabelProviderContribution');
 export interface LabelProviderContribution {
 
@@ -149,6 +136,7 @@ export class DefaultUriLabelProviderContribution implements LabelProviderContrib
     }
 
     protected getFileIcon(uri: URI): string | undefined {
+        // eslint-disable-next-line deprecation/deprecation
         const fileIcon = fileIcons.getClassWithColor(uri.displayName);
         if (!fileIcon) {
             return undefined;
@@ -158,6 +146,7 @@ export class DefaultUriLabelProviderContribution implements LabelProviderContrib
 
     getName(element: URI | URIIconReference): string | undefined {
         const uri = this.getUri(element);
+        // eslint-disable-next-line deprecation/deprecation
         return uri && uri.displayName;
     }
 

packages/core/src/browser/preferences/preference-contribution.ts

@@ -213,12 +213,9 @@ export class PreferenceSchemaProvider extends PreferenceProvider {
         return { preferenceName, oldValue, newValue, scope, domain };
     }
 
-    /** @deprecated since 0.6.0 pass preferenceName as the second arg */
-    protected getDefaultValue(property: PreferenceItem): any;
-    protected getDefaultValue(property: PreferenceItem, preferenceName: string): any;
-    protected getDefaultValue(property: PreferenceItem, preferenceName?: string): any {
+    protected getDefaultValue(property: PreferenceItem, preferenceName: string): any {
         const config = FrontendApplicationConfigProvider.get();
-        if (preferenceName && FrontendApplicationPreferenceConfig.is(config) && preferenceName in config.preferences) {
+        if (FrontendApplicationPreferenceConfig.is(config) && preferenceName in config.preferences) {
             return config.preferences[preferenceName];
         }
         if (property.defaultValue !== undefined) {

packages/core/src/browser/quick-open/index.ts

@@ -14,10 +14,8 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-export * from './quick-open-model';
 export * from './quick-open-action-provider';
 export * from './quick-open-service';
-export * from './quick-pick-service';
 export * from './quick-input-service';
 export * from './quick-command-service';
 export * from './quick-command-contribution';

packages/core/src/browser/quick-open/prefix-quick-open-service.ts

@@ -15,12 +15,12 @@
  ********************************************************************************/
 
 import { injectable, inject } from 'inversify';
-import { QuickOpenModel, QuickOpenItem, QuickOpenMode } from './quick-open-model';
-import { QuickOpenService, QuickOpenOptions } from './quick-open-service';
+import { QuickOpenOptions } from '../../common/quick-open-service';
+import { QuickOpenModel, QuickOpenActionProvider, QuickOpenItem, QuickOpenMode } from '../../common/quick-open-model';
+import { QuickOpenService } from './quick-open-service';
 import { Disposable, DisposableCollection } from '../../common/disposable';
 import { ILogger } from '../../common/logger';
 import { MaybePromise } from '../../common/types';
-import { QuickOpenActionProvider } from './quick-open-action-provider';
 import { QuickTitleBar } from './quick-title-bar';
 
 export const QuickOpenContribution = Symbol('QuickOpenContribution');

packages/core/src/browser/quick-open/quick-command-service.ts

@@ -16,9 +16,10 @@
 
 import { inject, injectable } from 'inversify';
 import { Command, CommandRegistry, Disposable } from '../../common';
-import { Keybinding, KeybindingRegistry } from '../keybinding';
-import { QuickOpenModel, QuickOpenItem, QuickOpenMode, QuickOpenGroupItem, QuickOpenGroupItemOptions } from './quick-open-model';
-import { QuickOpenOptions } from './quick-open-service';
+import { KeybindingRegistry } from '../keybinding';
+import { Keybinding } from '../../common/keybinding';
+import { QuickOpenOptions } from '../../common/quick-open-service';
+import { QuickOpenModel, QuickOpenGroupItemOptions, QuickOpenItem, QuickOpenGroupItem, QuickOpenMode } from '../../common/quick-open-model';
 import { QuickOpenContribution, QuickOpenHandlerRegistry, QuickOpenHandler } from './prefix-quick-open-service';
 import { ContextKeyService } from '../context-key-service';
 import { CLEAR_COMMAND_HISTORY } from './quick-command-contribution';

packages/core/src/browser/quick-open/quick-input-service.ts

@@ -16,13 +16,12 @@
 
 import { inject, injectable } from 'inversify';
 import { QuickOpenService } from './quick-open-service';
-import { QuickOpenItem, QuickOpenMode } from './quick-open-model';
 import { Deferred } from '../../common/promise-util';
 import { MaybePromise } from '../../common/types';
 import { MessageType } from '../../common/message-service-protocol';
 import { Emitter, Event } from '../../common/event';
 import { QuickTitleBar } from './quick-title-bar';
-import { QuickTitleButton } from '../../common/quick-open-model';
+import { QuickTitleButton, QuickOpenItem, QuickOpenMode } from '../../common/quick-open-model';
 import { CancellationToken } from '../../common/cancellation';
 
 export interface QuickInputOptions {
@@ -159,17 +158,17 @@ export class QuickInputService {
                 currentText = lookFor;
             }
         }, {
-                prefix: options.value,
-                placeholder: options.placeHolder,
-                password: options.password,
-                ignoreFocusOut: options.ignoreFocusOut,
-                enabled: options.enabled,
-                valueSelection: options.valueSelection,
-                onClose: () => {
-                    result.resolve(undefined);
-                    this.quickTitleBar.hide();
-                }
-            });
+            prefix: options.value,
+            placeholder: options.placeHolder,
+            password: options.password,
+            ignoreFocusOut: options.ignoreFocusOut,
+            enabled: options.enabled,
+            valueSelection: options.valueSelection,
+            onClose: () => {
+                result.resolve(undefined);
+                this.quickTitleBar.hide();
+            }
+        });
 
         if (options && this.quickTitleBar.shouldShowTitleBar(options.title, options.step)) {
             this.quickTitleBar.attachTitleBar(this.quickOpenService.widgetNode, options.title, options.step, options.totalSteps, options.buttons);

packages/core/src/browser/quick-open/quick-open-action-provider.ts

@@ -16,22 +16,7 @@
 
 import { injectable } from 'inversify';
 import { QuickOpenItem } from '../../common/quick-open-model';
-import * as common from '../../common/quick-open-model';
-
-/**
- * @deprecated import from `@theia/core/lib/common/quick-open-model` instead
- */
-export type QuickOpenActionProvider = common.QuickOpenActionProvider;
-
-/**
- * @deprecated import from `@theia/core/lib/common/quick-open-model` instead
- */
-export type QuickOpenActionOptions = common.QuickOpenActionOptions;
-
-/**
- * @deprecated import from `@theia/core/lib/common/quick-open-model` instead
- */
-export type QuickOpenAction = common.QuickOpenAction;
+import { QuickOpenActionOptions, QuickOpenAction } from '../../common/quick-open-model';
 
 @injectable()
 export abstract class QuickOpenBaseAction implements QuickOpenAction {

packages/core/src/browser/quick-open/quick-open-service.ts

@@ -15,17 +15,12 @@
  ********************************************************************************/
 
 import { injectable } from 'inversify';
-import { QuickOpenModel } from './quick-open-model';
+import { QuickOpenModel } from '../../common/quick-open-model';
 import { MessageType } from '../../common/message-service-protocol';
 import * as common from '../../common/quick-open-service';
 import { QuickOpenItem } from '../../common/quick-open-model';
 import { Emitter } from '../../common/event';
 
-/**
- * @deprecated import from `@theia/core/lib/common/quick-open-service` instead
- */
-export { QuickOpenOptions } from '../../common/quick-open-service';
-
 @injectable()
 export class QuickOpenService {