fix microsoft#86300

jrieken · jrieken · commit 64b177b2e0bc · 2019-12-05T11:22:46.000+01:00
diff --git a/src/vs/workbench/api/common/extHostLanguageFeatures.ts b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
@@ -1209,11 +1209,10 @@ class CallHierarchyAdapter {
 	}
 
 	releaseSession(sessionId: string): void {
-		this._cache.delete(sessionId.charAt(0));
+		this._cache.delete(sessionId);
 	}
 
-	private _cacheAndConvertItem(itemOrSessionId: string, item: vscode.CallHierarchyItem): extHostProtocol.ICallHierarchyItemDto {
-		const sessionId = itemOrSessionId.charAt(0);
+	private _cacheAndConvertItem(sessionId: string, item: vscode.CallHierarchyItem): extHostProtocol.ICallHierarchyItemDto {
 		const map = this._cache.get(sessionId)!;
 		const dto: extHostProtocol.ICallHierarchyItemDto = {
 			_sessionId: sessionId,
@@ -1231,7 +1230,7 @@ class CallHierarchyAdapter {
 
 	private _itemFromCache(sessionId: string, itemId: string): vscode.CallHierarchyItem | undefined {
 		const map = this._cache.get(sessionId);
-		return map && map.get(itemId);
+		return map?.get(itemId);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1209,11 +1209,10 @@ class CallHierarchyAdapter {`
`1209`	`1209`	`}`
`1210`	`1210`
`1211`	`1211`	`releaseSession(sessionId: string): void {`
`1212`		`- this._cache.delete(sessionId.charAt(0));`
	`1212`	`+ this._cache.delete(sessionId);`
`1213`	`1213`	`}`
`1214`	`1214`
`1215`		`- private _cacheAndConvertItem(itemOrSessionId: string, item: vscode.CallHierarchyItem): extHostProtocol.ICallHierarchyItemDto {`
`1216`		`- const sessionId = itemOrSessionId.charAt(0);`
	`1215`	`+ private _cacheAndConvertItem(sessionId: string, item: vscode.CallHierarchyItem): extHostProtocol.ICallHierarchyItemDto {`
`1217`	`1216`	`const map = this._cache.get(sessionId)!;`
`1218`	`1217`	`const dto: extHostProtocol.ICallHierarchyItemDto = {`
`1219`	`1218`	`_sessionId: sessionId,`
`@@ -1231,7 +1230,7 @@ class CallHierarchyAdapter {`
`1231`	`1230`
`1232`	`1231`	`private _itemFromCache(sessionId: string, itemId: string): vscode.CallHierarchyItem \| undefined {`
`1233`	`1232`	`const map = this._cache.get(sessionId);`
`1234`		`- return map && map.get(itemId);`
	`1233`	`+ return map?.get(itemId);`
`1235`	`1234`	`}`
`1236`	`1235`	`}`
`1237`	`1236`