The Search []QNL report now allows to search ⎕SE as well

aplteam · Sep 11, 2023 · 507fd0a · 507fd0a
1 parent 1bc224d
commit 507fd0a
Show file tree

Hide file tree

Showing 17 changed files with 1,096 additions and 90 deletions.
diff --git a/APLSource/Admin/Make.aplf b/APLSource/Admin/Make.aplf
@@ -1,5 +1,9 @@
  Make flag;targetPath;home;M;name;setupExe;myUCMDsFolder;C;tempFolder;data;buff;cfg
 ⍝ Version 7.3.0 ⋄ 2023-06-18
+⍝ * 7.2.2 ⋄ 2023-09-11
+⍝   * Bug fixes
+⍝     * HTML documents were not found
+⍝     * Superfluous files removed from install folder
 ⍝ * 7.2.1 ⋄ 2023-06-18
 ⍝   * Uses latest features of MakeHelpers now
 ⍝   * Question added to avoid mishaps
@@ -16,7 +20,7 @@
      :If 18≢⊃⊃(//)⎕VFI buff←{⍵/⍨2>+\⍵='.'}2⊃# ⎕WG'APLVersion'  ⍝
          ('"Make" a new version with 18.0 - this is ',buff)⎕SIGNAL 11
      :EndIf
- :AndIf ##.TestCases.CommTools.YesOrNo 'Sure yout want to create a new version of Fire? (The WS will be destroyed in the process)'
+ :AndIf ##.TestCases.CommTools.YesOrNo'Sure yout want to create a new version of Fire? (The WS will be destroyed in the process)'
      home←##.CiderConfig.HOME,'/'
      targetPath←home,'Dist/'
      {⍵:.}' '≠1↑0⍴⎕FX↑'r←M' 'r←⎕SE.MakeHelpers'  ⍝ avoids creating a link in # that points to ⎕SE at the expense of defeating auto-complete
@@ -27,7 +31,9 @@
     ⍝⍝⍝⍝⍝⍝⍝⍝⍝⍝⍝
      M.RecreateFolder targetPath
      M.IncreaseBuildIDInFunction'#.Fire.Fire.Version'
-     M.FetchLaterUserCommand'Fire_uc.dyalog'cfg C('[MyUCMDs]',name)
+     :If ⎕NEXISTS M.GetMyUCMDsFolder'/Fire/Fire_uc.dyalog'
+         M.CopyBetter(home,'APLSource/Fire_uc.dyalog')(M.GetMyUCMDsFolder'/Fire/Fire_uc.dyalog')'Project version' '[MyUCMDs] version'
+     :EndIf
      {}⎕SE.Cider.CloseProject''  ⍝ Precaution
      ⎕WSID←tempFolder,name,'.dws'
      0 ⎕SAVE ⎕WSID
@@ -36,8 +42,8 @@
      '#.Fire.Fire'#.⎕CY ⎕WSID
      0 ⎕SAVE ⎕WSID
      './packages'M.CopyTo tempFolder
-     M.ConvertMarkdownToHtml5(home,'Docs/')(tempFolder,'html/')
-     M.##.F.DeleteFile tempFolder,'/html/readme.html'
+     M.ConvertMarkdownToHtml5(home,'Docs/')(home,'html/')
+     (home,'html/*')M.CopyTo tempFolder
      (home,##.CiderConfig.CIDER.source,'/',name,'_UC.dyalog')M.CopyTo tempFolder
      (home,'LICENSE')M.CopyTo tempFolder
      (home,'Fire.ico')M.CopyTo tempFolder
@@ -52,6 +58,7 @@
      :If 1 M.YesOrNo'Would you like to execute "',setupExe,'" ?'
          ⎕CMD targetPath,setupExe
      :EndIf
+     M.##.F.RmDirByForce tempFolder
      ⎕←'Clearing the workspace...'
      ⎕CLEAR
  :EndIf
diff --git a/APLSource/Fire/FindFireReadMe.aplf b/APLSource/Fire/FindFireReadMe.aplf
@@ -25,4 +25,5 @@
          :EndIf
      :EndIf
      p←Parent.FilesAndDirs.NormalizePath p
+     'Cannot find HTML documents'Assert 0<≢p
  :EndIf
diff --git a/APLSource/Fire/GUI/CreateReportMenu.aplf b/APLSource/Fire/GUI/CreateReportMenu.aplf
@@ -5,6 +5,7 @@
  ∆←⊂'MenuItem'
  ∆,←⊂'Caption'('Search QNL...')
  ∆,←⊂'HintObj'n.Info
+ ∆,←⊂'Accelerator'(118 0)
  ∆,←⊂'Hint' 'Search for names recursively. Note that this is the only way to find the name of a non-scripted namespace!'
  n.SearchQNL←⍎'SearchQNL'rf.⎕WC ∆
  n.SearchQNL.onSelect←'OnSearchQNL'

diff --git a/APLSource/Fire/GUI/SearchQNL/CreateGUI.aplf b/APLSource/Fire/GUI/SearchQNL/CreateGUI.aplf
@@ -4,13 +4,13 @@
  ∆←⊂'Form'
  ∆,←⊂'Caption'(##.##.AddPidToCaption'Fire - Search ⎕NL')
  ∆,←⊂'Coord' 'Pixel'
- ∆,←⊂'Size'(200 400)
+ ∆,←⊂'Size'(200 480)
  ∆,←⊂'Posn'(n.Form.Posn+50)
  ∆,←⊂'IconObj'n.TheIcon
  n2.Form←⍎'TheForm'n.Form.⎕WC ∆
  n2.Form.CursorObj←0
  n2.Form.n←n2
-
+ n2.Form.onConfigure←'##.OnConfigure'n2.Form.Size
 
  ∆←⊂'Label'
  ∆,←⊂'Posn'(10 10)
@@ -62,6 +62,28 @@
  ∆,←⊂'Attach'(4⍴'Top' 'Left')
  n2.Last←⍎'Last'n2.Group.⎕WC ∆
 
+ ∆←⊂'Group'
+ ∆,←⊂'Caption' 'Start search in'
+ ∆,←⊂'Posn'(n2.Group.Posn[0],10+1⊃+⌿⊃n2.Group.(Posn Size))
+ ∆,←⊂'Size'(80 160)
+ ∆,←⊂'Attach'(4⍴'Top' 'Left')
+ n2.Group2←⍎'Group'n2.Form.⎕WC ∆
+
+ ∆←⊂'Button'
+ ∆,←⊂'Caption' '&#'
+ ∆,←⊂'Posn'(20 10)
+ ∆,←⊂'Style' 'Radio'
+ ∆,←⊂'State' 1
+ ∆,←⊂'Attach'(4⍴'Top' 'Left')
+ n2.Root←⍎'FullPath'n2.Group2.⎕WC ∆
+
+ ∆←⊂'Button'
+ ∆,←⊂'Caption' '⎕S&E'
+ ∆,←⊂'Posn'((15+↑+/⊃n2.FullPath.(Posn Size)),10)
+ ∆,←⊂'Style' 'Radio'
+ ∆,←⊂'Attach'(4⍴'Top' 'Left')
+ n2.QSE←⍎'Last'n2.Group2.⎕WC ∆
+
  ∆←⊂'Button'
  ∆,←⊂'Caption' '&OK'
  ∆,←⊂'Default' 1

diff --git a/APLSource/Fire/GUI/SearchQNL/OnOK.aplf b/APLSource/Fire/GUI/SearchQNL/OnOK.aplf
@@ -4,5 +4,6 @@
      parms.SearchIsRegEx←n2.IsRegEx.State
      parms.SearchFor←n2.SearchFor.Text
      parms.Case←n2.Case.State
+     parms.StartSearchIn←↑n2.(Root QSE).State/'#' '⎕SE'
      Search parms
  }
diff --git a/APLSource/Fire/History.apla b/APLSource/Fire/History.apla
@@ -1,6 +1,10 @@
 (
  '⍝ Contains information regarding the last release. A full history is available on GitHub. (This line is ignored)'
  ''
+ '* 9.6.0 from 2023-09-11'
+ '  * The "Search ⎕NL" report now allows to search either in # or in ⎕SE'
+ '  * "Search in ⎕NL" has now a function key assigned to it: F7'
+ ''
  '* 9.5.2 from 2023-03-25'
  '  * Bug fix: people who do not tick "Options > Object Syntax > Expose GUI Properties" could not use "Replace"'
  ''

diff --git a/APLSource/Fire/ShowReadMe.aplf b/APLSource/Fire/ShowReadMe.aplf
@@ -1,7 +1,7 @@
  {r}←ShowReadMe dummy;f;msg
  ⍝ Load the Markdown-based HTML document and show it in the default browser.
  r←⍬
- :If F.Exists{0∊⍴⍵:0 ⋄ ⍺⍺ ⍵}G.HelpPath
+ :If F.Exists{0=≢⍵:0 ⋄ ⍺⍺ ⍵}G.HelpPath
      A.GoToWebPage'file://',G.HelpPath
  :Else
      msg←⊂'Could not find the document.'

diff --git a/APLSource/Fire/Version.aplf b/APLSource/Fire/Version.aplf
@@ -1,3 +1,3 @@
  r←Version
  ⍝ See also `History`
- r←'Fire' '9.5.2+268' '2023-03-25'
+ r←'Fire' '9.6.0+276' '2023-10-11'
diff --git a/Docs/ReleaseNotes.md b/Docs/ReleaseNotes.md
@@ -13,6 +13,10 @@ A bump of the minor number indicates added functionality plus possibly bug fixes
 
 A bump of the patch number indicates bug fixes.
 
+## Version 9.6.0 from 2023-09-11
+
+* The "Search [ ]NL" report now allows to start a search in either `#` or in `⎕SE`.
+
 ## Version 9.5.2 from 2023-03-25
 
 Bug fix: people who do not tick "Options > Object Syntax > Expose GUI Properties" could not use "Replace"
@@ -136,4 +140,5 @@ Bug fix: people who do not tick "Options > Object Syntax > Expose GUI Properties
   * When after a search for an RegEx a one-by-one replace operation was triggered Fire might produce a VALUE ERRROR.
   * In the "Replace" dialog the "Delete lines" options should not be available (active) when it is a RegEx search.
   * The `∆List` function created by `Fire.API.CreateSearchParms` was buggy.
-* Internal change: all calls to acre via ⎕SE.UCMDS have now been replaced by calls to acre's API.
+* Internal change: all calls to acre via ⎕SE.UCMDS have now been replaced by calls to acre's API.
+
diff --git a/Fire.iss b/Fire.iss
@@ -43,13 +43,14 @@ Name: "english"; MessagesFile: "compiler:Default.isl"; LicenseFile: "License";
 
 [Files]
 Source: "{#TargetDir}Fire_uc.dyalog"; DestDir: "{app}";
-Source: "{#TargetDir}Fire_uc.dyalog"; DestDir: "{app}/test/";
-Source: "{#TargetDir}html/FireAndRegularExpressions.html"; DestDir: "{app}";
-Source: "{#TargetDir}html/ReleaseNotes.html"; DestDir: "{app}";
-Source: "{#TargetDir}html/UsefulRegExes.html"; DestDir: "{app}";
+Source: "{#TargetDir}ReadMe.html"; DestDir: "{app}";
+Source: "{#TargetDir}FireAndRegularExpressions.html"; DestDir: "{app}";
+Source: "{#TargetDir}FireAndRegularExpressions.html"; DestDir: "{app}";
+Source: "{#TargetDir}ReleaseNotes.html"; DestDir: "{app}";
+Source: "{#TargetDir}UsefulRegExes.html"; DestDir: "{app}";
 Source: "{#TargetDir}{#MyAppExeName}"; DestDir: "{app}"
 Source: "{#TargetDir}packages/*"; DestDir: "{app}/packages/"; Flags: recursesubdirs
-;Source: "{#TargetDir}LICENSE"; DestDir: "{app}"
+Source: "{#TargetDir}LICENSE"; DestDir: "{app}"
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

diff --git a/cider.config b/cider.config
@@ -1,72 +1 @@
-{
-  CIDER: {
-    dependencies: {
-      tatin: "./packages/",
-    },
-    dependencies_dev: {
-      tatin: "./packages_dev=TestCases",
-    },
-    distributionFolder: "Dist",
-    init: "Initialize",
-    make: "Admin.Make 1",
-    parent: "#",
-    projectSpace: "Fire",
-    project_url: "https://github.com/aplteam/Fire",
-    source: "APLSource",
-    tests: "TestCases.RunTests",
-  },
-  LINK: {
-    arrays: 0,
-    beforeRead: "",
-    beforeWrite: "",
-    caseCode: 0,
-    codeExtensions: [
-      "aplf",
-      "aplo",
-      "apln",
-      "aplc",
-      "apli",
-      "dyalog",
-      "apl",
-      "mipage",
-    ],
-    fastLoad: 0,
-    flatten: 0,
-    forceExtensions: 0,
-    forceFilenames: 1,
-    getFilename: "",
-    typeExtensions: [
-      [
-        2,
-        "apla",
-      ],
-      [
-        3,
-        "aplf",
-      ],
-      [
-        4,
-        "aplo",
-      ],
-      [
-        9.1,
-        "apln",
-      ],
-      [
-        9.4,
-        "aplc",
-      ],
-      [
-        9.5,
-        "apli",
-      ],
-    ],
-    watch: "ns",
-  },
-  SYSVARS: {
-    io: 1,
-    ml: 1,
-  },
-  USER: {
-  },
-}
+{  CIDER: {    dependencies: {      tatin: "./packages/",    },    dependencies_dev: {      tatin: "./packages_dev=TestCases",    },    distributionFolder: "Dist",    init: "Initialize",    make: "Admin.Make 1",    parent: "#",    projectSpace: "Fire",    project_url: "https://github.com/aplteam/Fire",    source: "APLSource",    tests: "TestCases.RunTests",  },  LINK: {    forceFilenames: 1,    watch: "ns",  },  SYSVARS: {    io: 1,    ml: 1,  },  USER: {  },}
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,4 +25,5 @@ @@
              :EndIf
          :EndIf
          p←Parent.FilesAndDirs.NormalizePath p
+         'Cannot find HTML documents'Assert 0<≢p
      :EndIf