Skip to content

Commit 91526fb

Browse files
committed
updated rename lib
fixed error reporting
1 parent 400874a commit 91526fb

File tree

4 files changed

+22
-9
lines changed

4 files changed

+22
-9
lines changed

haxe_libraries/rename.hxml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# @install: lix --silent download "gh://github.com/HaxeCheckstyle/haxe-rename#bcb4112911ca3d70bf847c951381282a272add18" into rename/2.3.1/github/bcb4112911ca3d70bf847c951381282a272add18
2-
-cp ${HAXE_LIBCACHE}/rename/2.3.1/github/bcb4112911ca3d70bf847c951381282a272add18/src
1+
# @install: lix --silent download "gh://github.com/HaxeCheckstyle/haxe-rename#19b2667de5d5302e6f3a7e650efcb7771d11082d" into rename/2.3.1/github/19b2667de5d5302e6f3a7e650efcb7771d11082d
2+
-cp ${HAXE_LIBCACHE}/rename/2.3.1/github/19b2667de5d5302e6f3a7e650efcb7771d11082d/src
33
-D rename=2.3.1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ class CodeActionFeature {
129129
refactorFeature.createCodeActionEdits(context, type, action, params).then(workspaceEdit -> {
130130
action.edit = workspaceEdit;
131131
resolve(action);
132-
});
132+
}).catchError((e) -> reject(e));
133133
}
134134
}
135135
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import haxe.display.Display.HoverDisplayItemOccurence;
55
import haxe.display.JsonModuleTypes.JsonType;
66
import haxeLanguageServer.protocol.DisplayPrinter;
77
import js.lib.Promise;
8-
import refactor.ITypeList;
9-
import refactor.ITyper;
10-
import refactor.TypingHelper.TypeHintType;
8+
import refactor.typing.ITypeList;
9+
import refactor.typing.ITyper;
10+
import refactor.typing.TypeHintType;
1111

1212
using Lambda;
1313
using haxeLanguageServer.helper.PathHelper;

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package haxeLanguageServer.features.haxe.refactoring;
22

3+
import haxe.Exception;
34
import haxe.PosInfos;
45
import haxe.display.Server.ServerMethods;
56
import haxe.io.Path;
@@ -103,8 +104,14 @@ class RefactorCache {
103104
final workspacePath = context.workspacePath.normalize();
104105
final srcFolders = classPaths.map(f -> Path.join([workspacePath.toString(), f]));
105106

106-
TraverseSources.traverseSources(srcFolders, usageContext);
107-
usageContext.usageCollector.updateImportHx(usageContext);
107+
try {
108+
TraverseSources.traverseSources(srcFolders, usageContext);
109+
usageContext.usageCollector.updateImportHx(usageContext);
110+
} catch (e:Exception) {
111+
#if debug
112+
trace("failed to updateFileCache: " + e);
113+
#end
114+
}
108115

109116
endProgress();
110117
}
@@ -116,7 +123,13 @@ class RefactorCache {
116123
public function updateSingleFileCache(uri:String) {
117124
final usageContext:UsageContext = makeUsageContext();
118125
usageContext.fileName = uri;
119-
TraverseSources.collectIdentifierData(usageContext);
126+
try {
127+
TraverseSources.collectIdentifierData(usageContext);
128+
} catch (e:Exception) {
129+
#if debug
130+
trace("failed to updateSingleFileCache: " + e);
131+
#end
132+
}
120133
}
121134

122135
public function invalidateFile(uri:String) {

0 commit comments

Comments
 (0)