added rewrite vars to finals and vice versa

added option to extract constructor params as var or final
remove full cache invalidation before rename / refactor operation

Author: AlexHaxe

haxe_libraries/rename.hxml

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

src/haxeLanguageServer/features/haxe/RefactorFeature.hx

@@ -25,32 +25,35 @@ class RefactorFeature implements CodeActionContributor {
 	public function createCodeActions(params:CodeActionParams):Array<CodeAction> {
 		var actions:Array<CodeAction> = [];
 		if (params.context.only != null) {
-			if (params.context.only.contains(Refactor)) {}
-			if (params.context.only.contains(RefactorExtract)) {
-				actions = actions.concat(extractRefactors(params));
-			}
-			if (params.context.only.contains(RefactorRewrite)) {}
-			// if (params.context.only.contains(RefactorMove)) {} // upcoming LSP 3.18.0
-			if (params.context.only.contains(RefactorInline)) {}
+			actions = actions.concat(extractRefactors(params, i -> {
+				if (i == null) {
+					return false;
+				}
+				return params.context.only.contains(i.codeActionKind);
+			}));
 		} else {
-			actions = actions.concat(extractRefactors(params));
+			actions = actions.concat(extractRefactors(params, i -> true));
 		}
 
 		return actions;
 	}
 
-	function extractRefactors(params:CodeActionParams):Array<CodeAction> {
+	function extractRefactors(params:CodeActionParams, filterType:FilterRefactorModuleCB):Array<CodeAction> {
 		var actions:Array<CodeAction> = [];
 		final canRefactorContext = refactorCache.makeCanRefactorContext(context.documents.getHaxe(params.textDocument.uri), params.range);
 		if (canRefactorContext == null) {
 			return actions;
 		}
-		var refactorInfo:Array<Null<RefactorInfo>> = [
+		var allRefactorInfos:Array<Null<RefactorInfo>> = [
 			getRefactorInfo(ExtractInterface),
 			getRefactorInfo(ExtractMethod),
 			getRefactorInfo(ExtractType),
-			getRefactorInfo(ExtractConstructorParams),
+			getRefactorInfo(ExtractConstructorParamsAsVars),
+			getRefactorInfo(ExtractConstructorParamsAsFinals),
+			getRefactorInfo(RewriteVarsToFinals),
+			getRefactorInfo(RewriteFinalsToVars),
 		];
+		final refactorInfo = allRefactorInfos.filter(filterType);
 		refactorCache.updateSingleFileCache(canRefactorContext.what.fileName);
 		for (refactor in refactorInfo) {
 			if (refactor == null) {
@@ -62,7 +65,6 @@ class RefactorFeature implements CodeActionContributor {
 					actions.push(makeEmptyCodeAction(title, refactor.codeActionKind, params, refactor.type));
 			}
 		}
-
 		return actions;
 	}
 
@@ -94,13 +96,37 @@ class RefactorFeature implements CodeActionContributor {
 					title: "extractType",
 					prefix: "[ExtractType]"
 				}
-			case ExtractConstructorParams:
+			case ExtractConstructorParamsAsVars:
+				return {
+					refactorType: RefactorExtractConstructorParams(false),
+					type: type,
+					codeActionKind: RefactorExtract,
+					title: "extractConstructorParamsAsVars",
+					prefix: "[ExtractConstructorParams as Vars]"
+				}
+			case ExtractConstructorParamsAsFinals:
 				return {
-					refactorType: RefactorExtractConstructorParams,
+					refactorType: RefactorExtractConstructorParams(true),
 					type: type,
 					codeActionKind: RefactorExtract,
-					title: "extractConstructorParams",
-					prefix: "[ExtractConstructorParams]"
+					title: "extractConstructorParamsAsFinals",
+					prefix: "[ExtractConstructorParams as Finals]"
+				}
+			case RewriteVarsToFinals:
+				return {
+					refactorType: RefactorRewriteVarsToFinals(true),
+					type: type,
+					codeActionKind: RefactorRewrite,
+					title: "refactorRewriteVarsToFinals",
+					prefix: "[RefactorRewriteVarsToFinals]"
+				}
+			case RewriteFinalsToVars:
+				return {
+					refactorType: RefactorRewriteVarsToFinals(false),
+					type: type,
+					codeActionKind: RefactorRewrite,
+					title: "refactorRewriteFinalsToVars",
+					prefix: "[RefactorRewriteFinalsToVars]"
 				}
 		}
 	}
@@ -115,7 +141,6 @@ class RefactorFeature implements CodeActionContributor {
 
 	public function createCodeActionEdits(context:Context, type:CodeActionResolveType, action:CodeAction, params:CodeActionParams):Promise<WorkspaceEdit> {
 		var endProgress = context.startProgress("Performing Refactor Operation…");
-
 		var actions:Array<CodeAction> = [];
 		final editList:EditList = new EditList();
 		final refactorContext = refactorCache.makeRefactorContext(context.documents.getHaxe(params.textDocument.uri), params.range, editList);
@@ -127,7 +152,6 @@ class RefactorFeature implements CodeActionContributor {
 			return Promise.reject("failed to make refactor context");
 		}
 		final onResolve:(?result:Null<Dynamic>, ?debugInfo:Null<String>) -> Void = context.startTimer("refactor/" + info.title);
-		refactorCache.updateFileCache();
 		return Refactoring.doRefactor(info.refactorType, refactorContext).then((result:RefactorResult) -> {
 			var promise = switch (result) {
 				case NoChange:
@@ -166,3 +190,5 @@ typedef RefactorInfo = {
 	var title:String;
 	var prefix:String;
 }
+
+typedef FilterRefactorModuleCB = (info:Null<RefactorInfo>) -> Bool;

src/haxeLanguageServer/features/haxe/RenameFeature.hx

@@ -77,7 +77,6 @@ class RenameFeature {
 		var endProgress = context.startProgress("Performing Rename Operation…");
 
 		final filePath:FsPath = uri.toFsPath();
-		refactorCache.updateFileCache();
 
 		final editList:EditList = new EditList();
 		refactor.Rename.rename(refactorCache.makeRenameContext(doc, filePath, params.position, params.newName, editList)).then((result:RefactorResult) -> {

src/haxeLanguageServer/features/haxe/codeAction/CodeActionFeature.hx

@@ -20,7 +20,10 @@ enum CodeActionResolveType {
 	ExtractInterface;
 	ExtractMethod;
 	ExtractType;
-	ExtractConstructorParams;
+	ExtractConstructorParamsAsVars;
+	ExtractConstructorParamsAsFinals;
+	RewriteVarsToFinals;
+	RewriteFinalsToVars;
 }
 
 typedef CodeActionResolveData = {
@@ -65,9 +68,6 @@ class CodeActionFeature {
 		registerContributor(new ExtractConstantFeature(context));
 		registerContributor(new DiagnosticsCodeActionFeature(context));
 		registerContributor(refactorFeature);
-		#if debug
-		// registerContributor(new ExtractFunctionFeature(context));
-		#end
 	}
 
 	public function registerContributor(contributor:CodeActionContributor) {
@@ -99,7 +99,8 @@ class CodeActionFeature {
 					return;
 				}
 			case AddTypeHint:
-			case ExtractInterface | ExtractMethod | ExtractType | ExtractConstructorParams:
+			case ExtractInterface | ExtractMethod | ExtractType | ExtractConstructorParamsAsVars | ExtractConstructorParamsAsFinals | RewriteVarsToFinals |
+				RewriteFinalsToVars:
 		}
 		switch (type) {
 			case MissingArg, ChangeFinalToVar, AddTypeHint:
@@ -126,7 +127,8 @@ class CodeActionFeature {
 						arguments: command.arguments ?? []
 					});
 				}).catchError((e) -> reject(e));
-			case ExtractInterface | ExtractMethod | ExtractType | ExtractConstructorParams:
+			case ExtractInterface | ExtractMethod | ExtractType | ExtractConstructorParamsAsVars | ExtractConstructorParamsAsFinals | RewriteVarsToFinals |
+				RewriteFinalsToVars:
 				refactorFeature.createCodeActionEdits(context, type, action, params).then(workspaceEdit -> {
 					action.edit = workspaceEdit;
 					resolve(action);