From a906203dd4664dd6db6f40d586093120663aa33d Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 22 Apr 2016 17:49:39 +0200 Subject: [PATCH] debt - remove unused IEqualable --- src/vs/base/common/objects.ts | 10 ------ .../instantiation/common/descriptors.ts | 32 +++---------------- 2 files changed, 5 insertions(+), 37 deletions(-) diff --git a/src/vs/base/common/objects.ts b/src/vs/base/common/objects.ts index 9939af47e27..5d99959db66 100644 --- a/src/vs/base/common/objects.ts +++ b/src/vs/base/common/objects.ts @@ -6,16 +6,6 @@ import * as Types from 'vs/base/common/types'; -/** - * Equalable objects can compute a - * hash-code and can also tell if they - * are equal to other objects. - */ -export interface IEqualable { - equals(other: any): boolean; -} - - export function clone(obj: T): T { if (!obj || typeof obj !== 'object') { return obj; diff --git a/src/vs/platform/instantiation/common/descriptors.ts b/src/vs/platform/instantiation/common/descriptors.ts index f614992f6a3..d1246f92ced 100644 --- a/src/vs/platform/instantiation/common/descriptors.ts +++ b/src/vs/platform/instantiation/common/descriptors.ts @@ -4,9 +4,8 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import errors = require('vs/base/common/errors'); -import objects = require('vs/base/common/objects'); -import instantiation = require('./instantiation'); +import {illegalArgument} from 'vs/base/common/errors'; +import * as instantiation from './instantiation'; export class AbstractDescriptor { @@ -30,12 +29,12 @@ export class AbstractDescriptor { _validate(type: T): void { if (!type) { - throw errors.illegalArgument('can not be falsy'); + throw illegalArgument('can not be falsy'); } } } -export class SyncDescriptor extends AbstractDescriptor implements objects.IEqualable { +export class SyncDescriptor extends AbstractDescriptor { constructor(private _ctor: any, ...staticArguments: any[]) { super(staticArguments); @@ -45,16 +44,6 @@ export class SyncDescriptor extends AbstractDescriptor implements objects. return this._ctor; } - public equals(other: any): boolean { - if (other === this) { - return true; - } - if (!(other instanceof SyncDescriptor)) { - return false; - } - return (>other).ctor === this.ctor; - } - protected bind(...moreStaticArguments): SyncDescriptor { let allArgs = []; allArgs = allArgs.concat(this.staticArguments()); @@ -188,7 +177,7 @@ export interface SyncDescriptor8 { bind(a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7, a8: A8): SyncDescriptor0; } -export class AsyncDescriptor extends AbstractDescriptor implements AsyncDescriptor0, objects.IEqualable { +export class AsyncDescriptor extends AbstractDescriptor implements AsyncDescriptor0 { public static create(moduleName: string, ctorName: string): AsyncDescriptor { return new AsyncDescriptor(moduleName, ctorName); @@ -209,17 +198,6 @@ export class AsyncDescriptor extends AbstractDescriptor implements AsyncDe return this._ctorName; } - public equals(other: any): boolean { - if (other === this) { - return true; - } - if (!(other instanceof AsyncDescriptor)) { - return false; - } - return (>other).moduleName === this.moduleName && - (>other).ctorName === this.ctorName; - } - bind(...moreStaticArguments): AsyncDescriptor { let allArgs = []; allArgs = allArgs.concat(this.staticArguments()); -- GitLab