Skip to content

Commit b1712c6

Browse files
committed
Normalizing the project path in <OpenProject> was not perfect
1 parent a28b7c5 commit b1712c6

File tree

6 files changed

+528
-503
lines changed

6 files changed

+528
-503
lines changed

APLSource/Cider/OpenProject.aplf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
:EndIf
2222
'"folder" must be specified'Assert 0<parms.⎕NC'folder'
2323
'"folder" must be specified'Assert 0<≢parms.folder
24-
parms.folder←{('/'≠1⍴⍵)∧(~':'∊⍵)∧('[]'≢⍵[1,≢⍵]):F.EnforceSlash'expand'F.NormalizePath F.PWD,'/',⍵ ⋄ ⍵}{⍵↓⍨+/∧\' '=⍵}parms.folder
24+
parms.folder←{(~(1⍴⍵)∊'/\')∧(~':'∊⍵)∧('[]'≢⍵[1,≢⍵]):⊢F.EnforceSlash'expand'F.NormalizePath F.PWD,'/',⍵ ⋄ ⍵}{⍵↓⍨+/∧\' '=⍵}parms.folder
25+
parms.folder←F.NormalizePath parms.folder
2526
'"projectSpace" must be specified'Assert 0<parms.⎕NC'projectSpace'
2627
'"watch" must be one of: ns|dir|both'Assert(⊂⎕C parms.watch)∊'ns' 'dir' 'both' 'none' 0
2728
p←{⍺←parms.(verbose batch) ⋄ ⍺ PrintToSession ⍵}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
R←Test_Open_091(stopFlag batchFlag);⎕TRAP;parms;success;log
2+
⍝ Opens a project with a path that starts with a "/" but later uses "\"; was once a bug
3+
⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
4+
R←T._Failed
5+
6+
#.⎕SHADOW'TEMP' ⋄ 'TEMP'#.⎕NS''
7+
parms←##.Cider.CreateOpenParms ⍬
8+
parms.folder←##.CiderConfig.HOME,'\TestData\LxProject'
9+
parms.parent←'#.TEMP'
10+
##.Cider.C.AddAutomation'YesOrNo' 'ExecLX@' 'y'
11+
(success log)←##.Cider.OpenProject parms
12+
'Something is very wrong'Assert 1=success
13+
14+
→T.GoToTidyUp 1≠#.TEMP.DateAndTime.⎕IO
15+
→T.GoToTidyUp 0≠#.TEMP.DateAndTime.DateAndTime.⎕IO
16+
17+
R←T._OK
18+
19+
∆TidyUp:
20+
##.Cider.C.Cleanup
21+
{}##.Cider.CloseProject #.TEMP.DateAndTime
22+
⍝Done

TestResults/CodeCoverage.cr

120 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)