From a73b4236b0246f25dbb72d223a4bae59bad95ea9 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 5 Jun 2019 09:21:02 +0200
Subject: [PATCH] properly keep resolved code lens command, #74846

---
 src/vs/workbench/api/common/extHostLanguageFeatures.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/api/common/extHostLanguageFeatures.ts b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
index dc0e77b0610..940927b6f4d 100644
--- a/src/vs/workbench/api/common/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
@@ -145,7 +145,8 @@ class CodeLensAdapter {
 	resolveCodeLens(symbol: CodeLensDto, token: CancellationToken): Promise<CodeLensDto | undefined> {
 
 		const lens = symbol.cacheId && this._cache.get(...symbol.cacheId);
-		if (!lens) {
+		const disposables = symbol.cacheId && this._disposables.get(symbol.cacheId[0]);
+		if (!lens || !disposables) {
 			return Promise.resolve(undefined);
 		}
 
@@ -158,7 +159,7 @@ class CodeLensAdapter {
 
 		return resolve.then(newLens => {
 			newLens = newLens || lens;
-			symbol.command = this._commands.toInternal(newLens.command || CodeLensAdapter._badCmd);
+			symbol.command = this._commands.toInternal2(newLens.command || CodeLensAdapter._badCmd, disposables);
 			return symbol;
 		});
 	}