Skip to content

Commit bb5d119

Browse files
committed
updated rename lib
implemented new rename file reader interface
1 parent c54db13 commit bb5d119

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

.vscode/settings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"editor.formatOnSave": true,
44
"editor.formatOnPaste": true,
55
"editor.codeActionsOnSave": {
6-
"source.sortImports": true
6+
"source.sortImports": "explicit"
77
}
88
},
99
"haxe.executable": "auto",

haxe_libraries/rename.hxml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# @install: lix --silent download "haxelib:/rename#2.2.3" into rename/2.2.3/haxelib
2-
-cp ${HAXE_LIBCACHE}/rename/2.2.3/haxelib/src
3-
-D rename=2.2.3
1+
# @install: lix --silent download "haxelib:/rename#2.3.0" into rename/2.3.0/haxelib
2+
-cp ${HAXE_LIBCACHE}/rename/2.3.0/haxelib/src
3+
-D rename=2.3.0

src/haxeLanguageServer/features/haxe/RenameFeature.hx

+16
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import languageServerProtocol.Types.WorkspaceEdit;
2020
import refactor.CanRefactorResult;
2121
import refactor.ITypeList;
2222
import refactor.ITyper;
23+
import refactor.discover.FileContentType;
24+
import refactor.discover.TraverseSources.simpleFileReader;
2325
import refactor.rename.RenameHelper.TypeHintType;
2426
import tokentree.TokenTree;
2527

@@ -167,6 +169,7 @@ class RenameFeature {
167169

168170
function makeUsageContext():refactor.discover.UsageContext {
169171
return {
172+
fileReader: readFile,
170173
fileName: "",
171174
file: null,
172175
usageCollector: new refactor.discover.UsageCollector(),
@@ -177,6 +180,19 @@ class RenameFeature {
177180
cache: cache
178181
};
179182
}
183+
184+
function readFile(path:String):FileContentType {
185+
var fsPath = new FsPath(path);
186+
var doc:Null<HaxeDocument> = context.documents.getHaxe(fsPath.toUri());
187+
if (doc == null) {
188+
return simpleFileReader(path);
189+
}
190+
var root:Null<TokenTree> = doc?.tokens?.tree;
191+
if (root != null) {
192+
return Token(root);
193+
}
194+
return Text(doc.content);
195+
}
180196
}
181197

182198
class EditList {

0 commit comments

Comments
 (0)