@theia/plugin-ext 1.31.0-next.32 → 1.31.0-next.33

package/src/plugin/type-converters.ts

@@ -724,8 +724,8 @@ export function toLocation(value: model.Location): types.Location {
     return new types.Location(URI.revive(value.uri), toRange(value.range));
 }
 
-export function fromCallHierarchyItem(item: types.CallHierarchyItem): model.CallHierarchyItem {
-    return <model.CallHierarchyItem>{
+export function fromHierarchyItem(item: types.CallHierarchyItem | types.TypeHierarchyItem): model.HierarchyItem {
+    return {
         kind: SymbolKind.fromSymbolKind(item.kind),
         name: item.name,
         detail: item.detail,
@@ -738,6 +738,10 @@ export function fromCallHierarchyItem(item: types.CallHierarchyItem): model.Call
     };
 }
 
+export function fromCallHierarchyItem(item: types.CallHierarchyItem): model.CallHierarchyItem {
+    return <model.CallHierarchyItem>fromHierarchyItem(item);
+}
+
 export function toCallHierarchyItem(value: model.CallHierarchyItem): types.CallHierarchyItem {
     const item = new types.CallHierarchyItem(
         SymbolKind.toSymbolKind(value.kind),
@@ -766,6 +770,35 @@ export function toCallHierarchyOutgoingCall(value: model.CallHierarchyOutgoingCa
         value.fromRanges && value.fromRanges.map(toRange));
 }
 
+export function isModelTypeHierarchyItem(arg: unknown): arg is model.TypeHierarchyItem {
+    const item = arg as model.TypeHierarchyItem;
+    return !!item && typeof item === 'object'
+        && isModelRange(item.range)
+        && isModelRange(item.selectionRange)
+        && isUriComponents(item.uri)
+        && !!item.name;
+}
+
+export function fromTypeHierarchyItem(item: types.TypeHierarchyItem): model.TypeHierarchyItem {
+    return <model.TypeHierarchyItem>fromHierarchyItem(item);
+}
+
+export function toTypeHierarchyItem(value: model.TypeHierarchyItem): types.TypeHierarchyItem {
+    const item = new types.TypeHierarchyItem(
+        SymbolKind.toSymbolKind(value.kind),
+        value.name,
+        value.detail ? value.detail : '',
+        URI.revive(value.uri),
+        toRange(value.selectionRange),
+        toRange(value.range),
+    );
+    item.tags = value.tags;
+    item._itemId = value._itemId;
+    item._sessionId = value._sessionId;
+
+    return item;
+}
+
 export function toWorkspaceFolder(folder: model.WorkspaceFolder): theia.WorkspaceFolder {
     return {
         uri: URI.revive(folder.uri),

package/src/plugin/types-impl.ts

@@ -2651,6 +2651,43 @@ export class CallHierarchyOutgoingCall {
     }
 }
 
+@es5ClassCompat
+export class TypeHierarchyItem {
+    _sessionId?: string;
+    _itemId?: string;
+
+    kind: SymbolKind;
+    tags?: readonly SymbolTag[];
+    name: string;
+    detail?: string;
+    uri: URI;
+    range: Range;
+    selectionRange: Range;
+
+    constructor(kind: SymbolKind, name: string, detail: string, uri: URI, range: Range, selectionRange: Range) {
+        this.kind = kind;
+        this.name = name;
+        this.detail = detail;
+        this.uri = uri;
+        this.range = range;
+        this.selectionRange = selectionRange;
+    }
+
+    static isTypeHierarchyItem(thing: {}): thing is TypeHierarchyItem {
+        if (thing instanceof TypeHierarchyItem) {
+            return true;
+        }
+        if (!thing) {
+            return false;
+        }
+        return typeof (<TypeHierarchyItem>thing).kind === 'number' &&
+            typeof (<TypeHierarchyItem>thing).name === 'string' &&
+            URI.isUri((<TypeHierarchyItem>thing).uri) &&
+            Range.isRange((<TypeHierarchyItem>thing).range) &&
+            Range.isRange((<TypeHierarchyItem>thing).selectionRange);
+    }
+}
+
 export enum LanguageStatusSeverity {
     Information = 0,
     Warning = 1,

package/lib/main/browser/callhierarchy/callhierarchy-type-converters.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"callhierarchy-type-converters.d.ts","sourceRoot":"","sources":["../../../../src/main/browser/callhierarchy/callhierarchy-type-converters.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC3H,OAAO,KAAK,KAAK,MAAM,sCAAsC,CAAC;AAC9D,OAAO,KAAK,GAAG,MAAM,gCAAgC,CAAC;AACtD,OAAO,KAAK,aAAa,MAAM,mDAAmD,CAAC;AAEnF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAE1D;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAE5D;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,aAAa,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAK7E;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,aAAa,CAAC,QAAQ,CAKzF;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,aAAa,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAK3E;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAQjE;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,aAAa,CAAC,KAAK,CAO/D;AAED,yBAAiB,mBAAmB,CAAC;IACjC,SAAgB,cAAc,CAAC,IAAI,EAAE,aAAa,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CA8B/E;IACD,SAAgB,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,GAAG,aAAa,CAAC,UAAU,CA8B7E;CACJ;AAED,wBAAgB,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;AACrF,wBAAgB,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,iBAAiB,GAAG,SAAS,GAAG,iBAAiB,GAAG,SAAS,CAAC;AAa7G,wBAAgB,cAAc,CAAC,UAAU,EAAE,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAOrF;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,yBAAyB,GAAG,yBAAyB,CAK3F;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,yBAAyB,GAAG,KAAK,CAAC,yBAAyB,CAK7F;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,yBAAyB,GAAG,yBAAyB,CAK3F;AAED,wBAAgB,uDAAuD,CAAC,MAAM,EAAE,yBAAyB,GAAG,KAAK,CAAC,yBAAyB,CAK1I;AAED,wBAAgB,uDAAuD,CAAC,MAAM,EAAE,yBAAyB,GAAG,KAAK,CAAC,yBAAyB,CAK1I"}

package/lib/main/browser/callhierarchy/callhierarchy-type-converters.js

@@ -1,178 +0,0 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2020 Red Hat, Inc. and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromCallHierarchyCalleeToModelCallHierarchyOutgoingCall = exports.fromCallHierarchyCallerToModelCallHierarchyIncomingCall = exports.toCallee = exports.fromCaller = exports.toCaller = exports.fromDefinition = exports.toDefinition = exports.SymbolKindConverter = exports.toRange = exports.fromRange = exports.fromPosition = exports.toLocation = exports.fromLocation = exports.fromUriComponents = exports.toUriComponents = void 0;
-const model = require("../../../common/plugin-api-rpc-model");
-const callhierarchy = require("@theia/core/shared/vscode-languageserver-protocol");
-const vscode_uri_1 = require("@theia/core/shared/vscode-uri");
-function toUriComponents(uri) {
-    return vscode_uri_1.URI.parse(uri);
-}
-exports.toUriComponents = toUriComponents;
-function fromUriComponents(uri) {
-    return vscode_uri_1.URI.revive(uri).toString();
-}
-exports.fromUriComponents = fromUriComponents;
-function fromLocation(location) {
-    return {
-        uri: vscode_uri_1.URI.parse(location.uri),
-        range: fromRange(location.range)
-    };
-}
-exports.fromLocation = fromLocation;
-function toLocation(uri, range) {
-    return {
-        uri: vscode_uri_1.URI.revive(uri).toString(),
-        range: toRange(range)
-    };
-}
-exports.toLocation = toLocation;
-function fromPosition(position) {
-    return {
-        lineNumber: position.line,
-        column: position.character
-    };
-}
-exports.fromPosition = fromPosition;
-function fromRange(range) {
-    const { start, end } = range;
-    return {
-        startLineNumber: start.line + 1,
-        startColumn: start.character + 1,
-        endLineNumber: end.line + 1,
-        endColumn: end.character + 1,
-    };
-}
-exports.fromRange = fromRange;
-function toRange(range) {
-    return callhierarchy.Range.create(range.startLineNumber - 1, range.startColumn - 1, range.endLineNumber - 1, range.endColumn - 1);
-}
-exports.toRange = toRange;
-var SymbolKindConverter;
-(function (SymbolKindConverter) {
-    function fromSymbolKind(kind) {
-        switch (kind) {
-            case callhierarchy.SymbolKind.File: return model.SymbolKind.File;
-            case callhierarchy.SymbolKind.Module: return model.SymbolKind.Module;
-            case callhierarchy.SymbolKind.Namespace: return model.SymbolKind.Namespace;
-            case callhierarchy.SymbolKind.Package: return model.SymbolKind.Package;
-            case callhierarchy.SymbolKind.Class: return model.SymbolKind.Class;
-            case callhierarchy.SymbolKind.Method: return model.SymbolKind.Method;
-            case callhierarchy.SymbolKind.Property: return model.SymbolKind.Property;
-            case callhierarchy.SymbolKind.Field: return model.SymbolKind.Field;
-            case callhierarchy.SymbolKind.Constructor: return model.SymbolKind.Constructor;
-            case callhierarchy.SymbolKind.Enum: return model.SymbolKind.Enum;
-            case callhierarchy.SymbolKind.Interface: return model.SymbolKind.Interface;
-            case callhierarchy.SymbolKind.Function: return model.SymbolKind.Function;
-            case callhierarchy.SymbolKind.Variable: return model.SymbolKind.Variable;
-            case callhierarchy.SymbolKind.Constant: return model.SymbolKind.Constant;
-            case callhierarchy.SymbolKind.String: return model.SymbolKind.String;
-            case callhierarchy.SymbolKind.Number: return model.SymbolKind.Number;
-            case callhierarchy.SymbolKind.Boolean: return model.SymbolKind.Boolean;
-            case callhierarchy.SymbolKind.Array: return model.SymbolKind.Array;
-            case callhierarchy.SymbolKind.Object: return model.SymbolKind.Object;
-            case callhierarchy.SymbolKind.Key: return model.SymbolKind.Key;
-            case callhierarchy.SymbolKind.Null: return model.SymbolKind.Null;
-            case callhierarchy.SymbolKind.EnumMember: return model.SymbolKind.EnumMember;
-            case callhierarchy.SymbolKind.Struct: return model.SymbolKind.Struct;
-            case callhierarchy.SymbolKind.Event: return model.SymbolKind.Event;
-            case callhierarchy.SymbolKind.Operator: return model.SymbolKind.Operator;
-            case callhierarchy.SymbolKind.TypeParameter: return model.SymbolKind.TypeParameter;
-            default: return model.SymbolKind.Property;
-        }
-    }
-    SymbolKindConverter.fromSymbolKind = fromSymbolKind;
-    function toSymbolKind(kind) {
-        switch (kind) {
-            case model.SymbolKind.File: return callhierarchy.SymbolKind.File;
-            case model.SymbolKind.Module: return callhierarchy.SymbolKind.Module;
-            case model.SymbolKind.Namespace: return callhierarchy.SymbolKind.Namespace;
-            case model.SymbolKind.Package: return callhierarchy.SymbolKind.Package;
-            case model.SymbolKind.Class: return callhierarchy.SymbolKind.Class;
-            case model.SymbolKind.Method: return callhierarchy.SymbolKind.Method;
-            case model.SymbolKind.Property: return callhierarchy.SymbolKind.Property;
-            case model.SymbolKind.Field: return callhierarchy.SymbolKind.Field;
-            case model.SymbolKind.Constructor: return callhierarchy.SymbolKind.Constructor;
-            case model.SymbolKind.Enum: return callhierarchy.SymbolKind.Enum;
-            case model.SymbolKind.Interface: return callhierarchy.SymbolKind.Interface;
-            case model.SymbolKind.Function: return callhierarchy.SymbolKind.Function;
-            case model.SymbolKind.Variable: return callhierarchy.SymbolKind.Variable;
-            case model.SymbolKind.Constant: return callhierarchy.SymbolKind.Constant;
-            case model.SymbolKind.String: return callhierarchy.SymbolKind.String;
-            case model.SymbolKind.Number: return callhierarchy.SymbolKind.Number;
-            case model.SymbolKind.Boolean: return callhierarchy.SymbolKind.Boolean;
-            case model.SymbolKind.Array: return callhierarchy.SymbolKind.Array;
-            case model.SymbolKind.Object: return callhierarchy.SymbolKind.Object;
-            case model.SymbolKind.Key: return callhierarchy.SymbolKind.Key;
-            case model.SymbolKind.Null: return callhierarchy.SymbolKind.Null;
-            case model.SymbolKind.EnumMember: return callhierarchy.SymbolKind.EnumMember;
-            case model.SymbolKind.Struct: return callhierarchy.SymbolKind.Struct;
-            case model.SymbolKind.Event: return callhierarchy.SymbolKind.Event;
-            case model.SymbolKind.Operator: return callhierarchy.SymbolKind.Operator;
-            case model.SymbolKind.TypeParameter: return callhierarchy.SymbolKind.TypeParameter;
-            default: return callhierarchy.SymbolKind.Property;
-        }
-    }
-    SymbolKindConverter.toSymbolKind = toSymbolKind;
-})(SymbolKindConverter = exports.SymbolKindConverter || (exports.SymbolKindConverter = {}));
-function toDefinition(definition) {
-    if (!definition) {
-        return undefined;
-    }
-    return Object.assign(Object.assign({}, definition), { kind: SymbolKindConverter.toSymbolKind(definition.kind), range: toRange(definition.range), selectionRange: toRange(definition.selectionRange) });
-}
-exports.toDefinition = toDefinition;
-function fromDefinition(definition) {
-    return Object.assign(Object.assign({}, definition), { kind: SymbolKindConverter.fromSymbolKind(definition.kind), range: fromRange(definition.range), selectionRange: fromRange(definition.range) });
-}
-exports.fromDefinition = fromDefinition;
-function toCaller(caller) {
-    return {
-        from: toDefinition(caller.from),
-        fromRanges: caller.fromRanges.map(toRange)
-    };
-}
-exports.toCaller = toCaller;
-function fromCaller(caller) {
-    return {
-        from: fromDefinition(caller.from),
-        fromRanges: caller.fromRanges.map(fromRange)
-    };
-}
-exports.fromCaller = fromCaller;
-function toCallee(callee) {
-    return {
-        to: toDefinition(callee.to),
-        fromRanges: callee.fromRanges.map(toRange),
-    };
-}
-exports.toCallee = toCallee;
-function fromCallHierarchyCallerToModelCallHierarchyIncomingCall(caller) {
-    return {
-        from: fromDefinition(caller.from),
-        fromRanges: caller.fromRanges.map(fromRange),
-    };
-}
-exports.fromCallHierarchyCallerToModelCallHierarchyIncomingCall = fromCallHierarchyCallerToModelCallHierarchyIncomingCall;
-function fromCallHierarchyCalleeToModelCallHierarchyOutgoingCall(callee) {
-    return {
-        to: fromDefinition(callee.to),
-        fromRanges: callee.fromRanges.map(fromRange),
-    };
-}
-exports.fromCallHierarchyCalleeToModelCallHierarchyOutgoingCall = fromCallHierarchyCalleeToModelCallHierarchyOutgoingCall;
-//# sourceMappingURL=callhierarchy-type-converters.js.map

package/lib/main/browser/callhierarchy/callhierarchy-type-converters.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"callhierarchy-type-converters.js","sourceRoot":"","sources":["../../../../src/main/browser/callhierarchy/callhierarchy-type-converters.ts"],"names":[],"mappings":"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"}

package/src/main/browser/callhierarchy/callhierarchy-type-converters.ts

@@ -1,193 +0,0 @@
-// *****************************************************************************
-// Copyright (C) 2020 Red Hat, Inc. and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { CallHierarchyItem, CallHierarchyIncomingCall, CallHierarchyOutgoingCall } from '@theia/callhierarchy/lib/browser';
-import * as model from '../../../common/plugin-api-rpc-model';
-import * as rpc from '../../../common/plugin-api-rpc';
-import * as callhierarchy from '@theia/core/shared/vscode-languageserver-protocol';
-import { URI } from '@theia/core/shared/vscode-uri';
-import { UriComponents } from '../../../common/uri-components';
-
-export function toUriComponents(uri: string): UriComponents {
-    return URI.parse(uri);
-}
-
-export function fromUriComponents(uri: UriComponents): string {
-    return URI.revive(uri).toString();
-}
-
-export function fromLocation(location: callhierarchy.Location): model.Location {
-    return <model.Location>{
-        uri: URI.parse(location.uri),
-        range: fromRange(location.range)
-    };
-}
-
-export function toLocation(uri: UriComponents, range: model.Range): callhierarchy.Location {
-    return {
-        uri: URI.revive(uri).toString(),
-        range: toRange(range)
-    };
-}
-
-export function fromPosition(position: callhierarchy.Position): rpc.Position {
-    return <rpc.Position>{
-        lineNumber: position.line,
-        column: position.character
-    };
-}
-
-export function fromRange(range: callhierarchy.Range): model.Range {
-    const { start, end } = range;
-    return {
-        startLineNumber: start.line + 1,
-        startColumn: start.character + 1,
-        endLineNumber: end.line + 1,
-        endColumn: end.character + 1,
-    };
-}
-
-export function toRange(range: model.Range): callhierarchy.Range {
-    return callhierarchy.Range.create(
-        range.startLineNumber - 1,
-        range.startColumn - 1,
-        range.endLineNumber - 1,
-        range.endColumn - 1,
-    );
-}
-
-export namespace SymbolKindConverter {
-    export function fromSymbolKind(kind: callhierarchy.SymbolKind): model.SymbolKind {
-        switch (kind) {
-            case callhierarchy.SymbolKind.File: return model.SymbolKind.File;
-            case callhierarchy.SymbolKind.Module: return model.SymbolKind.Module;
-            case callhierarchy.SymbolKind.Namespace: return model.SymbolKind.Namespace;
-            case callhierarchy.SymbolKind.Package: return model.SymbolKind.Package;
-            case callhierarchy.SymbolKind.Class: return model.SymbolKind.Class;
-            case callhierarchy.SymbolKind.Method: return model.SymbolKind.Method;
-            case callhierarchy.SymbolKind.Property: return model.SymbolKind.Property;
-            case callhierarchy.SymbolKind.Field: return model.SymbolKind.Field;
-            case callhierarchy.SymbolKind.Constructor: return model.SymbolKind.Constructor;
-            case callhierarchy.SymbolKind.Enum: return model.SymbolKind.Enum;
-            case callhierarchy.SymbolKind.Interface: return model.SymbolKind.Interface;
-            case callhierarchy.SymbolKind.Function: return model.SymbolKind.Function;
-            case callhierarchy.SymbolKind.Variable: return model.SymbolKind.Variable;
-            case callhierarchy.SymbolKind.Constant: return model.SymbolKind.Constant;
-            case callhierarchy.SymbolKind.String: return model.SymbolKind.String;
-            case callhierarchy.SymbolKind.Number: return model.SymbolKind.Number;
-            case callhierarchy.SymbolKind.Boolean: return model.SymbolKind.Boolean;
-            case callhierarchy.SymbolKind.Array: return model.SymbolKind.Array;
-            case callhierarchy.SymbolKind.Object: return model.SymbolKind.Object;
-            case callhierarchy.SymbolKind.Key: return model.SymbolKind.Key;
-            case callhierarchy.SymbolKind.Null: return model.SymbolKind.Null;
-            case callhierarchy.SymbolKind.EnumMember: return model.SymbolKind.EnumMember;
-            case callhierarchy.SymbolKind.Struct: return model.SymbolKind.Struct;
-            case callhierarchy.SymbolKind.Event: return model.SymbolKind.Event;
-            case callhierarchy.SymbolKind.Operator: return model.SymbolKind.Operator;
-            case callhierarchy.SymbolKind.TypeParameter: return model.SymbolKind.TypeParameter;
-            default: return model.SymbolKind.Property;
-        }
-    }
-    export function toSymbolKind(kind: model.SymbolKind): callhierarchy.SymbolKind {
-        switch (kind) {
-            case model.SymbolKind.File: return callhierarchy.SymbolKind.File;
-            case model.SymbolKind.Module: return callhierarchy.SymbolKind.Module;
-            case model.SymbolKind.Namespace: return callhierarchy.SymbolKind.Namespace;
-            case model.SymbolKind.Package: return callhierarchy.SymbolKind.Package;
-            case model.SymbolKind.Class: return callhierarchy.SymbolKind.Class;
-            case model.SymbolKind.Method: return callhierarchy.SymbolKind.Method;
-            case model.SymbolKind.Property: return callhierarchy.SymbolKind.Property;
-            case model.SymbolKind.Field: return callhierarchy.SymbolKind.Field;
-            case model.SymbolKind.Constructor: return callhierarchy.SymbolKind.Constructor;
-            case model.SymbolKind.Enum: return callhierarchy.SymbolKind.Enum;
-            case model.SymbolKind.Interface: return callhierarchy.SymbolKind.Interface;
-            case model.SymbolKind.Function: return callhierarchy.SymbolKind.Function;
-            case model.SymbolKind.Variable: return callhierarchy.SymbolKind.Variable;
-            case model.SymbolKind.Constant: return callhierarchy.SymbolKind.Constant;
-            case model.SymbolKind.String: return callhierarchy.SymbolKind.String;
-            case model.SymbolKind.Number: return callhierarchy.SymbolKind.Number;
-            case model.SymbolKind.Boolean: return callhierarchy.SymbolKind.Boolean;
-            case model.SymbolKind.Array: return callhierarchy.SymbolKind.Array;
-            case model.SymbolKind.Object: return callhierarchy.SymbolKind.Object;
-            case model.SymbolKind.Key: return callhierarchy.SymbolKind.Key;
-            case model.SymbolKind.Null: return callhierarchy.SymbolKind.Null;
-            case model.SymbolKind.EnumMember: return callhierarchy.SymbolKind.EnumMember;
-            case model.SymbolKind.Struct: return callhierarchy.SymbolKind.Struct;
-            case model.SymbolKind.Event: return callhierarchy.SymbolKind.Event;
-            case model.SymbolKind.Operator: return callhierarchy.SymbolKind.Operator;
-            case model.SymbolKind.TypeParameter: return callhierarchy.SymbolKind.TypeParameter;
-            default: return callhierarchy.SymbolKind.Property;
-        }
-    }
-}
-
-export function toDefinition(definition: model.CallHierarchyItem): CallHierarchyItem;
-export function toDefinition(definition: model.CallHierarchyItem | undefined): CallHierarchyItem | undefined;
-export function toDefinition(definition: model.CallHierarchyItem | undefined): CallHierarchyItem | undefined {
-    if (!definition) {
-        return undefined;
-    }
-    return {
-        ...definition,
-        kind: SymbolKindConverter.toSymbolKind(definition.kind),
-        range: toRange(definition.range),
-        selectionRange: toRange(definition.selectionRange),
-    };
-}
-
-export function fromDefinition(definition: CallHierarchyItem): model.CallHierarchyItem {
-    return {
-        ...definition,
-        kind: SymbolKindConverter.fromSymbolKind(definition.kind),
-        range: fromRange(definition.range),
-        selectionRange: fromRange(definition.range),
-    };
-}
-
-export function toCaller(caller: model.CallHierarchyIncomingCall): CallHierarchyIncomingCall {
-    return {
-        from: toDefinition(caller.from),
-        fromRanges: caller.fromRanges.map(toRange)
-    };
-}
-
-export function fromCaller(caller: CallHierarchyIncomingCall): model.CallHierarchyIncomingCall {
-    return {
-        from: fromDefinition(caller.from),
-        fromRanges: caller.fromRanges.map(fromRange)
-    };
-}
-
-export function toCallee(callee: model.CallHierarchyOutgoingCall): CallHierarchyOutgoingCall {
-    return {
-        to: toDefinition(callee.to),
-        fromRanges: callee.fromRanges.map(toRange),
-    };
-}
-
-export function fromCallHierarchyCallerToModelCallHierarchyIncomingCall(caller: CallHierarchyIncomingCall): model.CallHierarchyIncomingCall {
-    return {
-        from: fromDefinition(caller.from),
-        fromRanges: caller.fromRanges.map(fromRange),
-    };
-}
-
-export function fromCallHierarchyCalleeToModelCallHierarchyOutgoingCall(callee: CallHierarchyOutgoingCall): model.CallHierarchyOutgoingCall {
-    return {
-        to: fromDefinition(callee.to),
-        fromRanges: callee.fromRanges.map(fromRange),
-    };
-}