From 2c09acb99e67f2d5403a33272a19c3a64c5232c5 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 26 Oct 2016 15:13:39 +0200
Subject: [PATCH] fix #12688

---
 .../api/node/extHostLanguageFeatures.ts       | 23 +++----------------
 .../api/node/extHostTypeConverters.ts         |  6 ++---
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
index c1e112f1123..4c079b8470b 100644
--- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
@@ -113,22 +113,12 @@ class DefinitionAdapter {
 		let pos = TypeConverters.toPosition(position);
 		return asWinJsPromise(token => this._provider.provideDefinition(doc, pos, token)).then(value => {
 			if (Array.isArray(value)) {
-				return value.map(DefinitionAdapter._convertLocation);
+				return value.map(TypeConverters.location.from);
 			} else if (value) {
-				return DefinitionAdapter._convertLocation(value);
+				return TypeConverters.location.from(value);
 			}
 		});
 	}
-
-	private static _convertLocation(location: vscode.Location): modes.Location {
-		if (!location) {
-			return;
-		}
-		return <modes.Location>{
-			uri: location.uri,
-			range: TypeConverters.fromRange(location.range)
-		};
-	}
 }
 
 class HoverAdapter {
@@ -208,17 +198,10 @@ class ReferenceAdapter {
 
 		return asWinJsPromise(token => this._provider.provideReferences(doc, pos, context, token)).then(value => {
 			if (Array.isArray(value)) {
-				return value.map(ReferenceAdapter._convertLocation);
+				return value.map(TypeConverters.location.from);
 			}
 		});
 	}
-
-	private static _convertLocation(location: vscode.Location): modes.Location {
-		return <modes.Location>{
-			uri: location.uri,
-			range: TypeConverters.fromRange(location.range)
-		};
-	}
 }
 
 class QuickFixAdapter {
diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts
index 344ab09f3eb..35a330bcc68 100644
--- a/src/vs/workbench/api/node/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/node/extHostTypeConverters.ts
@@ -248,10 +248,10 @@ export function toSymbolInformation(bearing: IWorkspaceSymbol): types.SymbolInfo
 
 
 export const location = {
-	from(value: types.Location): modes.Location {
+	from(value: vscode.Location): modes.Location {
 		return {
-			range: fromRange(value.range),
-			uri: value.uri
+			range: value.range && fromRange(value.range),
+			uri: <URI>value.uri
 		};
 	},
 	to(value: modes.Location): types.Location {