Skip to content

Commit 6a031c7

Browse files
committed
Try again and seems windows full_path have trailing slash
1 parent 3d952d7 commit 6a031c7

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/core/classPaths.ml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,9 @@ class class_paths = object(self)
169169
file
170170
| path :: l ->
171171
let path = path#path in
172-
let spath = String.lowercase_ascii (slashes path) in
172+
let path = slashes (Path.get_full_path path) in
173+
let path = if String.length path > 0 && not (String.ends_with "/" path) then path ^ "/" else path in
174+
let spath = String.lowercase_ascii path in
173175
let slen = String.length spath in
174176
if slen > 0 && slen < flen && String.sub fpath_lower 0 slen = spath then String.sub fpath slen (flen - slen) else loop l
175177
in

tests/unit/src/unit/issues/Issue3348.hx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package unit.issues;
33
class Issue3348 extends Test {
44

55
function test() {
6-
eq("unit.issues.Issue3348,src/unit/issues/Issue3348.hx,6,test", getPos1());
7-
eq("unit.issues.Issue3348,src/unit/issues/Issue3348.hx,7,test", getPos2());
8-
eq("unit.issues.Issue3348,src/unit/issues/Issue3348.hx,8,test", getPos3("ok"));
9-
eq("unit.issues.Issue3348,src/unit/issues/Issue3348.hx,9,test", getPos4(1));
6+
eq("unit.issues.Issue3348,unit/issues/Issue3348.hx,6,test", getPos1());
7+
eq("unit.issues.Issue3348,unit/issues/Issue3348.hx,7,test", getPos2());
8+
eq("unit.issues.Issue3348,unit/issues/Issue3348.hx,8,test", getPos3("ok"));
9+
eq("unit.issues.Issue3348,unit/issues/Issue3348.hx,9,test", getPos4(1));
1010
}
1111

1212
static function getPosString(p:haxe.PosInfos) {

tests/unit/src/unitstd/haxe/Log.unit.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ haxe.Log.trace = function(v, ?i) {
88
trace("test trace");
99
haxe.Log.trace = old;
1010
s == "test trace";
11-
p.fileName == "src/unitstd/haxe/Log.unit.hx";
11+
p.fileName == "unitstd/haxe/Log.unit.hx";
1212
p.lineNumber == 8;
1313
haxe.Log.trace = null;
1414
exc(function() trace("exc test"));

0 commit comments

Comments
 (0)