Bug fix regarding the '\''Saerch for'\'' field'\''

aplteam · Jul 15, 2019 · aa74ddd · aa74ddd
1 parent 9ad85e1
commit aa74ddd
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 28 deletions.
diff --git a/APLSource/Fire-1/GUI-7/CheckSALTedScripts-9e1.aplf b/APLSource/Fire-1/GUI-7/CheckSALTedScripts-9e1.aplf
@@ -1,5 +1,6 @@
  CheckSALTedScripts←{
-⍝
+⍝ Check whether any SALT managed scripts got changed and if so report them.
+⍝ This is because Fire changes thenm in the WS but does NOT tell SALT about it.
      (0∊no←⍴##.G.ChangedSaltedScript):⍬
      m←⊂(⍕no),' script',((1<no)/'s'),' managed by SALT got changed,'
      m,←⊂' Would you like to get ',((1=no)/'a '),'SALT "Save" command',((1<no)/'s'),' printed to []SE?'

diff --git a/APLSource/Fire-1/GUI-7/CopyGuiToGlobal-291.aplf b/APLSource/Fire-1/GUI-7/CopyGuiToGlobal-291.aplf
@@ -21,7 +21,11 @@
      ##.G.Greedy←n.Greedy.State
      ##.G.NamesOnly←IsNamesOnlySearch n
      ##.G.Container←n.Container.State
-     ##.G.LookForList←⌽∪⌽##.G.LookForList,(n.SearchFor.Items,⊂n.SearchFor.Text)~⊂''
+     txt←n.SearchFor.Text
+     ##.G.LookForList←⌽∪⌽##.G.LookForList,(n.SearchFor.Items,⊂txt)~⊂''
+     n.SearchFor.Items←##.G.LookForList
+     n.SearchFor.SelItems[]←0
+     _←{0=≢⍵:⍬ ⋄ n.SearchFor.SelItems[##.G.LookForList⍳⊂⍵]←1}txt
      0∊≢¨##.G.LookForList:.
    ⍝ G.SearchFor2 might or might not be lowercase version of G.SearchFor depending
    ⍝      ↓↓↓↓↓↓↓↓↓↓   on user preferences. That's why this must be done late.

diff --git a/APLSource/Fire-1/History-1.aplf b/APLSource/Fire-1/History-1.aplf
@@ -1,6 +1,6 @@
  History
 ⍝⍝ Contains information regarding the last couple of releases. A full history is available on GitHub. (This line is ignored)
-⍝ * 7.2.0
-⍝   * The way Fire processes references pointing to namespaces has been improved.
+⍝ * 7.2.1
+⍝   * Bug fix: the "Search for" field lost its memory ot one stage.
 ⍝ \\
 ⍝ For information regarding older version see <https://github.com/aplteam/Fire/releases>
diff --git a/APLSource/Fire-1/Version-1.aplf b/APLSource/Fire-1/Version-1.aplf
@@ -1,3 +1,3 @@
  r←Version
  ⍝ See also `History`
- r←(1↓↑¯1↑⎕NPARTS⍕⎕THIS)'7.2.0.102' '2019-07-10'
+ r←(1↓↑¯1↑⎕NPARTS⍕⎕THIS)'7.2.1.109' '2019-07-15'
diff --git a/APLSource/TestCases-11/Test_ZZZ_996-e1.aplf b/APLSource/TestCases-11/Test_ZZZ_996-e1.aplf
@@ -0,0 +1,12 @@
+ R←Test_ZZZ_996(stopFlag batchFlag);⎕TRAP;rn;buff;searchFor
+⍝ Check the "ReleaseNotes.md" for carrying the correct version
+ ⎕TRAP←(999 'C' '. ⍝ Deliberate error')(0 'N')
+ R←∆Failed
+
+ rn←#.APLTreeUtils.ReadUtf8File'Docs\ReleaseNotes.md'
+ searchFor←'# Release Notes '
+ buff←rn⊃⍨1⍳⍨searchFor∘{⍺≡(≢⍺)↑⍵}¨rn
+ buff←(≢searchFor)↓buff
+ →PassesIf buff≡{⍵/⍨3>+\'.'=⍵}1⊃##.Fire.Version
+
+ R←∆OK
diff --git a/Docs/ReleaseNotes.md b/Docs/ReleaseNotes.md
@@ -1,5 +1,9 @@
 [parm]:saveHTML = 0 
 
+# Release Notes 7.2.1
+
+The combo box "Search for" did not carry the search terms any more from earlier searches.
+
 # Release Notes 7.2
 
 This release changes the way Fire processes references pointing to namespaces.

diff --git a/Fire (DESKTOP-4MG080U's conflicted copy 2019-07-09).dws b/Fire (DESKTOP-4MG080U's conflicted copy 2019-07-09).dws
diff --git a/Fire.dws b/Fire.dws
diff --git a/Fire.iss b/Fire.iss
@@ -1,6 +1,6 @@
 ; This script is best executed by Fire's "Make" utility.
 
-#define MyAppVersion "7.2.0.102"
+#define MyAppVersion "7.2.1.109"
 #define MyAppName "Fire"
 #define MyAppExeName "Fire.dws"
 #define MyAppPublisher "APL Team Ltd"

diff --git a/Fire_UC.dyalog b/Fire_UC.dyalog
@@ -5,24 +5,26 @@
 ⍝ If this is not the case then Fire is copied into []SE from
 ⍝ the same directory the User Command stems from and then started.
 ⍝ Kai Jaeger ⋄ APL Team Ltd
-⍝ Version 2.4.0 - 2019-06-10
-⍝ * In case a requiered module is not found an detail error report is provided.
-⍝ Version 2.3.0 - 2019-06-04
-⍝ * Fire now goes into `⎕SE._Fire.Fire` while all stuff that is needed but does not exist in ⎕SE
-⍝   goes into `⎕SE._Fire`. For stuff that exists in `⎕SE` refs are created in `⎕SE._Fire`.
-⍝ Version 2.2.0 - 2019-03-11
-⍝ * `GitHubAPIv3` added to the list of to-be-copied stuff.
-⍝ Version 2.1.1 - 2018-05-26
-⍝ The -fl option did not get rid of the GUI if Fire was already running.
-⍝ Version 2.1.0 - 2018-04-26
-⍝ * Tidied up.
-⍝ Version 2.0.1 - 2018-04-23
-⍝ * Minor change regarding the documentation.
-⍝ Version 2.0.0 - 2017-07-10
-⍝  * Massive changes: compatible only with Fire 6.0 and later.
-⍝  * Accepts `.` as an argument. Treated as "Copy current namespace into `Start looking here:`"
-⍝ Version 1.3.1 - 2017-02-24
-⍝  * Bug fix for the CommandFolder/WinReg key/separator problem
+⍝ * Version 2.4.1 - 2019-07-15
+⍝   * Bug fix: File was always loaded since the introduction of the ⎕SE._Fire level.
+⍝ * Version 2.4.0 - 2019-06-10
+⍝   * In case a requiered module is not found an detail error report is provided.
+⍝ * Version 2.3.0 - 2019-06-04
+⍝   * Fire now goes into `⎕SE._Fire.Fire` while all stuff that is needed but does not exist in ⎕SE
+⍝     goes into `⎕SE._Fire`. For stuff that exists in `⎕SE` refs are created in `⎕SE._Fire`.
+⍝ * Version 2.2.0 - 2019-03-11
+⍝   * `GitHubAPIv3` added to the list of to-be-copied stuff.
+⍝ * Version 2.1.1 - 2018-05-26
+⍝   The -fl option did not get rid of the GUI if Fire was already running.
+⍝ * Version 2.1.0 - 2018-04-26
+⍝   * Tidied up.
+⍝ * Version 2.0.1 - 2018-04-23
+⍝   * Minor change regarding the documentation.
+⍝ * Version 2.0.0 - 2017-07-10
+⍝   * Massive changes: compatible only with Fire 6.0 and later.
+⍝   * Accepts `.` as an argument. Treated as "Copy current namespace into `Start looking here:`"
+⍝ * Version 1.3.1 - 2017-02-24
+⍝   * Bug fix for the CommandFolder/WinReg key/separator problem
 
     ∇ r←List;⎕IO;⎕ML ⍝ this function usually returns 1 or more namespaces (here only 1)
       :Access Shared Public
@@ -40,11 +42,10 @@
       ⎕IO←0 ⋄ ⎕ML←3 ⋄ ⎕WX←3
       r←0 0⍴''
       flag←Args.Switch'fl'
-      neededModules←'APLTreeUtils' 'Fire' 'FilesAndDirs' 'OS' 'WinReg' 'GitHubAPIv3'  ⍝ to be copied
+      neededModules←'APLTreeUtils' 'FilesAndDirs' 'OS' 'WinReg' 'GitHubAPIv3'   ⍝ to be copied
       '_Fire'⎕SE.⎕NS''
       dne←0=↑∘⎕SE.⎕NC¨neededModules                                             ⍝ do not exist (dne)
       :If flag
-          dne[neededModules⍳⊂'Fire']←1                                          ⍝ Enforce a load
           :Trap 6 ⋄ ⎕SE._Fire.Fire.Cleanup ⋄ :EndTrap                           ⍝ Get rid of any GUI
           ⎕SE.⎕EX'_Fire'
           '_Fire'⎕SE.⎕NS''
@@ -56,6 +57,12 @@
           :EndIf
           CreateRefs(~dne)/neededModules
       :EndIf
+      :If 0=⎕SE._Fire.⎕NC'Fire'
+          (success msg)←ScanPathsFor'Fire'
+          :If 0=success
+              msg ⎕SIGNAL 6
+          :EndIf
+      :EndIf
       :If ∨/bool←0=↑∘⎕SE._Fire.⎕NC¨neededModules
           ⎕←'Copy operation failed:'
           ⎕←⍪' ',¨bool/neededModules

diff --git a/Make/Make.DWS b/Make/Make.DWS
diff --git a/publish (DESKTOP-4MG080U's conflicted copy 2019-07-09).config b/publish (DESKTOP-4MG080U's conflicted copy 2019-07-09).config
diff --git a/publish.config b/publish.config
@@ -1 +1 @@
-<tool name="Fire">  <version>7.2.0</version>  <date>2019-07-10</date>  <main>Fire</main>  <container>#._Fire</container>  <files>    <file>Fire_UC.dyalog</file>    <file>ReadMe.html</file>    <file>HowToInstall.html</file>    <file>UsefulRegExes.html</file>  </files>  <ignoreForNow>    <file>conga30ssl32.dll</file>    <file>conga30_32.dll</file>    <file>conga30ssl64.dll</file>    <file>conga30_64.dll</file>  </ignoreForNow>  <needs>    <script>APLTreeUtils</script>    <script>FilesAndDirs</script>    <script>OS</script>    <script>WinReg</script>    <script development="true">Tester</script>    <script>GitHubAPIv3</script>  </needs>  <ignoreForNow>    <ws copy="Rumba">Rumba</ws>  </ignoreForNow>  <scriptOnly>0</scriptOnly>  <wsid>Fire</wsid>  <autoload>1</autoload>  <buildid>102</buildid></tool>
+<tool name="Fire">  <version>7.2.1</version>  <date>2019-07-15</date>  <container>#._Fire</container>  <ignoreForNow>    <file>conga30ssl32.dll</file>    <file>conga30_32.dll</file>    <file>conga30ssl64.dll</file>    <file>conga30_64.dll</file>  </ignoreForNow>  <needs>    <script>APLTreeUtils</script>    <script>FilesAndDirs</script>    <script>OS</script>    <script>WinReg</script>    <script development="true">Tester</script>    <script>GitHubAPIv3</script>  </needs>  <ignoreForNow>    <ws copy="Rumba">Rumba</ws>  </ignoreForNow>  <autoload>1</autoload>  <buildid>109</buildid></tool>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<tool name="Fire"> <version>7.2.0</version> <date>2019-07-10</date> <main>Fire</main> <container>#._Fire</container> <files> <file>Fire_UC.dyalog</file> <file>ReadMe.html</file> <file>HowToInstall.html</file> <file>UsefulRegExes.html</file> </files> <ignoreForNow> <file>conga30ssl32.dll</file> <file>conga30_32.dll</file> <file>conga30ssl64.dll</file> <file>conga30_64.dll</file> </ignoreForNow> <needs> <script>APLTreeUtils</script> <script>FilesAndDirs</script> <script>OS</script> <script>WinReg</script> <script development="true">Tester</script> <script>GitHubAPIv3</script> </needs> <ignoreForNow> <ws copy="Rumba">Rumba</ws> </ignoreForNow> <scriptOnly>0</scriptOnly> <wsid>Fire</wsid> <autoload>1</autoload> <buildid>102</buildid></tool>
		<tool name="Fire"> <version>7.2.1</version> <date>2019-07-15</date> <container>#._Fire</container> <ignoreForNow> <file>conga30ssl32.dll</file> <file>conga30_32.dll</file> <file>conga30ssl64.dll</file> <file>conga30_64.dll</file> </ignoreForNow> <needs> <script>APLTreeUtils</script> <script>FilesAndDirs</script> <script>OS</script> <script>WinReg</script> <script development="true">Tester</script> <script>GitHubAPIv3</script> </needs> <ignoreForNow> <ws copy="Rumba">Rumba</ws> </ignoreForNow> <autoload>1</autoload> <buildid>109</buildid></tool>
Expand Down