Skip to content

Commit

Permalink
Update Haxe (#117)
Browse files Browse the repository at this point in the history
  • Loading branch information
RblSb authored Sep 5, 2023
1 parent 5085a57 commit 5cea29e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .haxerc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "b1b235b",
"version": "8878b58",
"resolveLibs": "scoped"
}
6 changes: 3 additions & 3 deletions haxe_libraries/hxnodejs.hxml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# @install: lix --silent download "haxelib:/hxnodejs#12.1.0" into hxnodejs/12.1.0/haxelib
-cp ${HAXE_LIBCACHE}/hxnodejs/12.1.0/haxelib/src
-D hxnodejs=12.1.0
# @install: lix --silent download "github:HaxeFoundation/hxnodejs#504066d" into hxnodejs/12.2.0/haxelib
-cp ${HAXE_LIBCACHE}/hxnodejs/12.2.0/haxelib/src
-D hxnodejs=12.2.0
--macro allowPackage('sys')
# should behave like other target defines and not be defined in macro context
--macro define('nodejs')
Expand Down
8 changes: 4 additions & 4 deletions src/haxeLanguageServer/features/haxe/RenameFeature.hx
Original file line number Diff line number Diff line change
Expand Up @@ -342,24 +342,24 @@ class LanguageServerTyper implements ITyper {
}
var reg = ~/Class<(.*)>/;

var type = item!.item!.type;
var type = item?.item?.type;
if (type == null) {
return null;
}
var path = type!.args!.path;
var path = type?.args?.path;
if (path == null) {
return null;
}
if (path.moduleName == "StdTypes" && path.typeName == "Null") {
var params = type!.args!.params;
var params = type?.args?.params;
if (params == null) {
return null;
}
type = params[0];
if (type == null) {
return null;
}
path = type!.args!.path;
path = type?.args?.path;
if (path == null) {
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ private enum abstract ImportType(Int) {
public function opLt(val:ImportType):Bool;

@:op(a > b)
public function opLt(val:ImportType):Bool;
public function opGt(val:ImportType):Bool;
}

private typedef ImportSortFunction = (a:ImportInfo, b:ImportInfo) -> Int;

0 comments on commit 5cea29e

Please sign in to comment.