diff --git a/src/vs/editor/contrib/rename/rename.ts b/src/vs/editor/contrib/rename/rename.ts
index 18a8dd64038e708600d5b8ed81b6f1bd22662401..f6cbd734f4260d1d8aef919983bc7ea47f4edc77 100644
--- a/src/vs/editor/contrib/rename/rename.ts
+++ b/src/vs/editor/contrib/rename/rename.ts
@@ -79,6 +79,9 @@ export function rename(model: ITextModel, position: Position, newName: string):
 	});
 }
 
+// TODO@joh
+// merge this into above function to make we always
+// use the same provider for resolving and renamin
 function resolveInitialRenameValue(model: ITextModel, position: Position): TPromise<RenameInitialValue> {
 	const [first] = RenameProviderRegistry.ordered(model);
 	if (!first || typeof first.resolveInitialRenameValue !== 'function') {