updated rename lib API

Author: AlexHaxe

haxe_libraries/rename.hxml

@@ -1,3 +1,3 @@
-# @install: lix --silent download "gh://github.com/HaxeCheckstyle/haxe-rename#19b2667de5d5302e6f3a7e650efcb7771d11082d" into rename/2.3.1/github/19b2667de5d5302e6f3a7e650efcb7771d11082d
--cp ${HAXE_LIBCACHE}/rename/2.3.1/github/19b2667de5d5302e6f3a7e650efcb7771d11082d/src
+# @install: lix --silent download "gh://github.com/HaxeCheckstyle/haxe-rename#7e161397241009b557c4c8e2edfbcd490b561b70" into rename/2.3.1/github/7e161397241009b557c4c8e2edfbcd490b561b70
+-cp ${HAXE_LIBCACHE}/rename/2.3.1/github/7e161397241009b557c4c8e2edfbcd490b561b70/src
 -D rename=2.3.1

src/haxeLanguageServer/features/haxe/RenameFeature.hx

@@ -50,22 +50,7 @@ class RenameFeature {
 		refactorCache.updateSingleFileCache(filePath.toString());
 
 		final editList:EditList = new EditList();
-		refactor.Rename.canRename({
-			nameMap: usageContext.nameMap,
-			fileList: usageContext.fileList,
-			typeList: usageContext.typeList,
-			what: {
-				fileName: filePath.toString(),
-				toName: "",
-				pos: refactorCache.converter.characterOffsetToByteOffset(doc.content, doc.offsetAt(params.position))
-			},
-			verboseLog: function(text:String, ?pos:PosInfos) {
-				#if debug
-				trace('[canRename] $text');
-				#end
-			},
-			typer: refactorCache.typer
-		}).then((result:CanRenameResult) -> {
+		refactor.Rename.canRename(refactorCache.makeCanRenameContext(doc, filePath, params.position)).then((result:CanRenameResult) -> {
 			if (result == null) {
 				reject(ResponseError.internalError("cannot rename identifier"));
 			}
@@ -95,24 +80,7 @@ class RenameFeature {
 		refactorCache.updateFileCache();
 
 		final editList:EditList = new EditList();
-		refactor.Rename.rename({
-			nameMap: refactorCache.nameMap,
-			fileList: refactorCache.fileList,
-			typeList: refactorCache.typeList,
-			what: {
-				fileName: filePath.toString(),
-				toName: params.newName,
-				pos: refactorCache.converter.characterOffsetToByteOffset(doc.content, doc.offsetAt(params.position))
-			},
-			forRealExecute: true,
-			docFactory: (filePath:String) -> new EditDoc(new FsPath(filePath), editList, context, refactorCache.converter),
-			verboseLog: function(text:String, ?pos:PosInfos) {
-				#if debug
-				trace('[rename] $text');
-				#end
-			},
-			typer: refactorCache.typer
-		}).then((result:RefactorResult) -> {
+		refactor.Rename.rename(refactorCache.makeRenameContext(doc, filePath, params.position, params.newName, editList)).then((result:RefactorResult) -> {
 			endProgress();
 			switch (result) {
 				case NoChange:

src/haxeLanguageServer/features/haxe/refactoring/RefactorCache.hx

@@ -15,6 +15,8 @@ import refactor.discover.UsageCollector;
 import refactor.discover.UsageContext;
 import refactor.refactor.CanRefactorContext;
 import refactor.refactor.RefactorContext;
+import refactor.rename.CanRenameContext;
+import refactor.rename.RenameContext;
 import tokentree.TokenTree;
 
 using haxeLanguageServer.helper.PathHelper;
@@ -23,8 +25,8 @@ class RefactorCache {
 	final context:Context;
 
 	public final cache:IFileCache;
-	public final converter:Haxe3DisplayOffsetConverter;
 	public final typer:LanguageServerTyper;
+	public final converter:Haxe3DisplayOffsetConverter;
 	public final usageCollector:UsageCollector;
 	public final nameMap:NameMap;
 	public final fileList:FileList;
@@ -35,8 +37,8 @@ class RefactorCache {
 		this.context = context;
 
 		cache = new MemCache();
-		typer = new LanguageServerTyper(context);
 		converter = new Haxe3DisplayOffsetConverter();
+		typer = new LanguageServerTyper(context);
 		usageCollector = new UsageCollector();
 		nameMap = new NameMap();
 		fileList = new FileList();
@@ -151,6 +153,52 @@ class RefactorCache {
 		};
 	}
 
+	public function makeCanRenameContext(doc:HaxeDocument, filePath:FsPath, position:Position):CanRenameContext {
+		return {
+			nameMap: nameMap,
+			fileList: fileList,
+			typeList: typeList,
+			what: {
+				fileName: filePath.toString(),
+				toName: "",
+				pos: converter.characterOffsetToByteOffset(doc.content, doc.offsetAt(position))
+			},
+			verboseLog: function(text:String, ?pos:PosInfos) {
+				#if debug
+				trace('[canRename] $text');
+				#end
+			},
+
+			typer: typer,
+			fileReader: readFile,
+			converter: converter.byteOffsetToCharacterOffset,
+		};
+	}
+
+	public function makeRenameContext(doc:HaxeDocument, filePath:FsPath, position:Position, newName:String, editList:EditList):RenameContext {
+		return {
+			nameMap: nameMap,
+			fileList: fileList,
+			typeList: typeList,
+			what: {
+				fileName: filePath.toString(),
+				toName: newName,
+				pos: converter.characterOffsetToByteOffset(doc.content, doc.offsetAt(position))
+			},
+			forRealExecute: true,
+			docFactory: (filePath:String) -> new EditDoc(new FsPath(filePath), editList, context, converter),
+			verboseLog: function(text:String, ?pos:PosInfos) {
+				#if debug
+				trace('[rename] $text');
+				#end
+			},
+
+			typer: typer,
+			fileReader: readFile,
+			converter: converter.byteOffsetToCharacterOffset,
+		};
+	}
+
 	public function makeCanRefactorContext(doc:Null<HaxeDocument>, range:Range):Null<CanRefactorContext> {
 		if (doc == null) {
 			return null;