File tree 3 files changed +20
-4
lines changed
src/haxeLanguageServer/features/haxe
3 files changed +20
-4
lines changed Original file line number Diff line number Diff line change 3
3
"editor.formatOnSave" : true ,
4
4
"editor.formatOnPaste" : true ,
5
5
"editor.codeActionsOnSave" : {
6
- "source.sortImports" : true
6
+ "source.sortImports" : " explicit "
7
7
}
8
8
},
9
9
"haxe.executable" : " auto" ,
Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff line change @@ -20,6 +20,8 @@ import languageServerProtocol.Types.WorkspaceEdit;
20
20
import refactor .CanRefactorResult ;
21
21
import refactor .ITypeList ;
22
22
import refactor .ITyper ;
23
+ import refactor .discover .FileContentType ;
24
+ import refactor .discover .TraverseSources .simpleFileReader ;
23
25
import refactor .rename .RenameHelper .TypeHintType ;
24
26
import tokentree .TokenTree ;
25
27
@@ -167,6 +169,7 @@ class RenameFeature {
167
169
168
170
function makeUsageContext (): refactor.discover. UsageContext {
169
171
return {
172
+ fileReader : readFile ,
170
173
fileName : " " ,
171
174
file : null ,
172
175
usageCollector : new refactor.discover. UsageCollector (),
@@ -177,6 +180,19 @@ class RenameFeature {
177
180
cache : cache
178
181
};
179
182
}
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
+ }
180
196
}
181
197
182
198
class EditList {
You can’t perform that action at this time.
0 commit comments