hpi-swa-teaching · matveysiva · May 17, 2022 · May 19, 2022 · May 23, 2022 · May 23, 2022
diff --git a/.coverage.smalltalk.ston b/.coverage.smalltalk.ston
@@ -1,4 +1,8 @@
 SmalltalkCISpec {
+  #preTesting : SCICustomScript {
+    #path : 'scripts/preTesting.st',
+    #platforms : [ #squeak ]
+  },
   #loading : [
     SCIMetacelloLoadSpec {
       #baseline : 'Algernon',

diff --git a/.github/workflows/coverage-reporter.yml b/.github/workflows/coverage-reporter.yml
@@ -6,7 +6,7 @@ jobs:
     name: Coverage Report
     runs-on: ubuntu-latest
     env:
-      ST_IMAGE: Squeak64-trunk
+      ST_IMAGE: Squeak64-5.3
     steps:
       - uses: actions/checkout@v2
       - uses: hpi-swa/setup-smalltalkCI@v1

diff --git a/.github/workflows/smalltalk-ci.yml b/.github/workflows/smalltalk-ci.yml
@@ -9,7 +9,7 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
         smalltalk:
           - Squeak64-5.3
-          - Squeak64-trunk
+          #- Squeak64-trunk
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
     steps:
@@ -20,7 +20,7 @@ jobs:
           smalltalk-image: ${{ matrix.smalltalk }}
       - run: smalltalkci -s ${{ matrix.smalltalk }}
         shell: bash
-        timeout-minutes: 15
+        timeout-minutes: 25
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   baselinetests:

diff --git a/.smalltalk.ston b/.smalltalk.ston
@@ -1,4 +1,8 @@
 SmalltalkCISpec {
+  #preTesting : SCICustomScript {
+    #path : 'scripts/preTesting.st',
+    #platforms : [ #squeak ]
+  },
   #loading : [
     SCIMetacelloLoadSpec {
       #baseline : 'Algernon',

diff --git a/README.md b/README.md
@@ -29,6 +29,7 @@ Algernon allows for keyboard only interaction - no need to use your mouse!
 | Tab              | Navigate in       |
 | Shift + Tab      | Navigate out      |
 | Enter            | Run selected item |
+| Ctrl + Delete    | Clear search bar  |
 
 *Important Notice:* Please be aware that using Algernon for the first time might be slow. The first query triggers the indexing that is used for searching objects. After a few seconds delay in the first query, Algernon should run fast as expected.
 
@@ -45,7 +46,10 @@ Algernon allows for keyboard only interaction - no need to use your mouse!
 - Search global variables
 - Print and evaluate Smalltalk expressions 
 - Action verbs for filtering and quick access (e.g. `run SomeTest` will only search for tests and set a default action)
-- full text search in classes
+- Full text search in classes
+- Search the web
+- Push/pull/commit with git
+- Change branches of your repository
 
 For explanations regarding the usage of the features check out the [wiki](https://github.com/hpi-swa-teaching/Algernon-Launcher/wiki).
 
@@ -63,18 +67,24 @@ Use the Test Runner Tool in your Squeak Image and select all *AlgernonTests*. No
 *  [Ann Katrin Kuessner](https://github.com/annkatrinkuessner)
 *  [Ben Bals](https://github.com/BenBals)
 *  [Benedikt Weber](https://github.com/bewee)
+*  [Elias Fiedler](https://github.com/EliasNotFound)
 *  [Franz Sauerwald](https://github.com/FranzSw)
+*  [Frederic Sadrieh](https://github.com/FSadrieh)
+*  [Georg Auge](https://github.com/gwauge)
 *  [Jannis Rosenbaum](https://github.com/sinnaj-r)
 *  [Jonathan Schneider](https://github.com/jonaschn)
 *  [Kai Robert Kirsten](https://github.com/robertkirsten)
 *  [Kay Erik Jenß](https://github.com/kej-jay)
 *  [Laura Meister](https://github.com/dieknolle3333)
+*  [Leonard Horns](https://github.com/leonardhorns)
 *  [Louis Kirsch](https://github.com/timediv)
+*  [Matvey Sivashinskiy](https://github.com/matveysiva)
 *  [Niklas Mohrin](https://github.com/niklasmohrin)
 *  [Nils Lissner](https://github.com/TheGrayStone)
 *  [Oliver Heß](https://github.com/Olliwehr)
 *  [Philip Weidenfeller](https://github.com/phlprcks)
 *  [Pius Ladenburger](https://github.com/GittiHab)
 *  [Tobias Dürschmid](https://github.com/tobiduer)
+*  [Yannik Dittmar](https://github.com/yannik-dittmar)
 
 Credits to Erik Hinterbichler and Joey Hagedorn, [the original creators of Algernon.](http://erikhinterbichler.com/apps/algernon/)
diff --git a/packages/Algernon.package/ALGAction.class/instance/hidden..st b/packages/Algernon.package/ALGAction.class/instance/hidden..st
@@ -0,0 +1,4 @@
+accessing
+hidden: aBoolean
+
+	hidden := aBoolean
diff --git a/packages/Algernon.package/ALGAction.class/instance/hidden.st b/packages/Algernon.package/ALGAction.class/instance/hidden.st
@@ -0,0 +1,4 @@
+accessing
+hidden
+
+	^ hidden ifNil: [hidden := false]
diff --git a/packages/Algernon.package/ALGAction.class/instance/keepOpen..st b/packages/Algernon.package/ALGAction.class/instance/keepOpen..st
@@ -0,0 +1,4 @@
+accessing
+keepOpen: aBoolean
+
+	keepOpen := aBoolean
diff --git a/packages/Algernon.package/ALGAction.class/instance/keepOpen.st b/packages/Algernon.package/ALGAction.class/instance/keepOpen.st
@@ -0,0 +1,4 @@
+accessing
+keepOpen
+
+	^ keepOpen ifNil: [keepOpen := false]
diff --git a/packages/Algernon.package/ALGAction.class/methodProperties.json b/packages/Algernon.package/ALGAction.class/methodProperties.json
@@ -8,8 +8,12 @@
 		"args" : "J.J. 7/28/2015 19:11",
 		"computeActionVerb" : "jRo 8/1/2020 11:34",
 		"do" : "Jro 5/26/2020 12:11",
+		"hidden" : "PureBehaviorTest 8/5/2022 13:12",
+		"hidden:" : "YD 8/5/2022 13:56",
 		"incrementNumTimesSelected" : "J.J. 7/28/2015 19:11",
 		"isLessThan:" : "rk 8/2/2020 22:50",
+		"keepOpen" : "PureBehaviorTest 8/5/2022 13:12",
+		"keepOpen:" : "YD 8/5/2022 13:57",
 		"name" : "J.J. 7/28/2015 19:12",
 		"name:" : "beb 6/25/2020 10:20",
 		"numTimesSelected" : "J.J. 7/28/2015 19:12",

diff --git a/packages/Algernon.package/ALGAction.class/properties.json b/packages/Algernon.package/ALGAction.class/properties.json
@@ -12,7 +12,9 @@
 		"theTarget",
 		"theSelector",
 		"theArgs",
-		"actionVerb" ],
+		"actionVerb",
+		"keepOpen",
+		"hidden" ],
 	"name" : "ALGAction",
 	"pools" : [
 		 ],

diff --git a/packages/Algernon.package/ALGActionItem.class/class/createListFrom..st b/packages/Algernon.package/ALGActionItem.class/class/createListFrom..st
@@ -1,6 +1,8 @@
 instance creation
 createListFrom: anItem
-	^ anItem algerActions collect: [ :anAction |
+	^ (anItem algerActions reject: [ :anAction |
+			anAction hidden]) 
+			collect: [ :anAction |
 			(self createFrom: anAction)
 				provider: anItem;
 				yourself ]
diff --git a/packages/Algernon.package/ALGActionItem.class/methodProperties.json b/packages/Algernon.package/ALGActionItem.class/methodProperties.json
@@ -1,7 +1,7 @@
 {
 	"class" : {
 		"createFrom:" : "jRo 8/5/2020 15:02",
-		"createListFrom:" : "beb 5/31/2020 18:26" },
+		"createListFrom:" : "YD 6/19/2022 20:14" },
 	"instance" : {
 		"name" : "td 6/8/2016 21:04",
 		"provider" : "J.J. 7/16/2015 18:39",

diff --git a/packages/Algernon.package/ALGActionVerbFilter.class/class/helpTexts.st b/packages/Algernon.package/ALGActionVerbFilter.class/class/helpTexts.st
@@ -1,5 +1,6 @@
 help
 helpTexts
+
 	^ (Dictionary new)
 		add: 'run'->'Run a test case.';
 		add: 'do'->'Run a given command. Do not print the output.';
@@ -14,4 +15,9 @@ helpTexts
 		add: 'collapse'-> 'Collapse a given window';
 		add: 'contract'-> 'Contract a given window from fullscreen';
 		add: 'close'-> 'Close a given window';
-		yourself
+		add: 'commit'-> 'Open an interactive commit window for a given git project and the checked out branch';
+		add: 'push'-> 'Push committed changes of a given git project and the checked out branch to the remote';
+		add: 'pull'-> 'Pull changes for a given git project and the checked out branch from the remote';
+		add: 'switch'-> 'Switch to a different local branch or create a one for a remote branch and switch to it';
+		add: 'web'-> 'Search the internet for answers';
+		yourself
diff --git a/packages/Algernon.package/ALGActionVerbFilter.class/class/keywords.st b/packages/Algernon.package/ALGActionVerbFilter.class/class/keywords.st
@@ -4,4 +4,6 @@ keywords
 		'open'. 'do'. 
 		'inspect'. 'explore'. '='.
 		'front'. 'expand'. 'collapse'. 
-		'contract'. 'close' }
+		'contract'. 'close'. 'web'.
+		'commit'. 'push'. 'pull'.
+		'switch' }
diff --git a/packages/Algernon.package/ALGActionVerbFilter.class/methodProperties.json b/packages/Algernon.package/ALGActionVerbFilter.class/methodProperties.json
@@ -1,6 +1,6 @@
 {
 	"class" : {
-		"helpTexts" : "lm 7/6/2021 20:54",
-		"keywords" : "lm 7/6/2021 20:53" },
+		"helpTexts" : "ga 7/29/2022 11:04",
+		"keywords" : "LH 7/10/2022 18:18" },
 	"instance" : {
 		"filter:given:" : "pw 8/4/2020 00:30" } }
diff --git a/packages/Algernon.package/ALGCore.class/class/close.st b/packages/Algernon.package/ALGCore.class/class/close.st
@@ -1,5 +1,4 @@
 singleton
 close
 
-	self currentInstance ifNotNil: [self currentInstance deactivate]
-
+	self currentInstance ifNotNil: [self currentInstance deactivate]
diff --git a/packages/Algernon.package/ALGCore.class/class/googleAPIKey..st b/packages/Algernon.package/ALGCore.class/class/googleAPIKey..st
@@ -0,0 +1,4 @@
+accessing
+googleAPIKey: aString
+
+	GoogleAPIKey := aString
diff --git a/packages/Algernon.package/ALGCore.class/class/googleAPIKey.st b/packages/Algernon.package/ALGCore.class/class/googleAPIKey.st
@@ -0,0 +1,4 @@
+accessing
+googleAPIKey
+
+	^ GoogleAPIKey ifNil: [GoogleAPIKey := '']
diff --git a/packages/Algernon.package/ALGCore.class/class/googleEngineId..st b/packages/Algernon.package/ALGCore.class/class/googleEngineId..st
@@ -0,0 +1,4 @@
+accessing
+googleEngineId: aString
+
+	GoogleEngineId := aString
diff --git a/packages/Algernon.package/ALGCore.class/class/googleEngineId.st b/packages/Algernon.package/ALGCore.class/class/googleEngineId.st
@@ -0,0 +1,4 @@
+accessing
+googleEngineId
+
+	^ GoogleEngineId ifNil: [GoogleEngineId := '']
diff --git a/packages/Algernon.package/ALGCore.class/class/initializeGlobalKeyBindings.st b/packages/Algernon.package/ALGCore.class/class/initializeGlobalKeyBindings.st
@@ -1,10 +1,11 @@
 initialization
 initializeGlobalKeyBindings
-
+	
 	KeyBindings := Dictionary newFrom:
 		{ '<down>' -> [:anEvent :morph | morph selectNext]. 
 		'<up>' -> [:anEvent :morph | morph selectPrevious]. 
-		'<tab>' -> [:anEvent :morph |  morph showChildListOrDoAction: anEvent]. 
+		'<tab>' -> [:anEvent :morph | morph showChildListOrDoAction: anEvent]. 
 		'<Shift-tab>' -> [:anEvent :morph | morph showParentList]. 
 		'<escape>' -> [:anEvent :morph | morph deactivate: anEvent hand]. 
-		'<cr>' -> [:anEvent :morph | morph doActionOnSelectedEvent:anEvent] }
+		'<cr>' -> [:anEvent :morph | morph doActionOnSelectedEvent: anEvent].
+		'<Ctrl-delete>' ->  [:anEvent :morph | morph clearSearchBar: anEvent] }
diff --git a/packages/Algernon.package/ALGCore.class/class/setGoogleAPIKey..st b/packages/Algernon.package/ALGCore.class/class/setGoogleAPIKey..st
@@ -0,0 +1,5 @@
+preferences
+setGoogleAPIKey: aString
+
+	self googleAPIKey: aString.
+	^ true
diff --git a/packages/Algernon.package/ALGCore.class/class/setGoogleAPIKey.st b/packages/Algernon.package/ALGCore.class/class/setGoogleAPIKey.st
@@ -0,0 +1,10 @@
+preferences
+setGoogleAPIKey
+
+	<preference: 'Set Google API Key'
+		category: #Algernon
+		description: 'Set the Google API Key needed for showing web search results in Algernon. (See https://github.com/hpi-swa-teaching/Algernon-Launcher/wiki/Setup-Guide#setup-google-web-search for more Information)'
+		type: #String>
+		^ self googleAPIKey
+
+
diff --git a/packages/Algernon.package/ALGCore.class/class/setGoogleEngineId..st b/packages/Algernon.package/ALGCore.class/class/setGoogleEngineId..st
@@ -0,0 +1,5 @@
+preferences
+setGoogleEngineId: aString
+
+	self googleEngineId: aString.
+	^ true
diff --git a/packages/Algernon.package/ALGCore.class/class/setGoogleEngineId.st b/packages/Algernon.package/ALGCore.class/class/setGoogleEngineId.st
@@ -0,0 +1,10 @@
+preferences
+setGoogleEngineId
+
+	<preference: 'Set Google Custom Search Engine ID'
+		category: #Algernon
+		description: 'Set the Google Custom Search Engine ID needed for showing web search results in Algernon. (See https://github.com/hpi-swa-teaching/Algernon-Launcher/wiki/Setup-Guide#setup-google-web-search for more Information)'
+		type: #String>
+		^ self googleEngineId
+
+
diff --git a/packages/Algernon.package/ALGCore.class/instance/activate..st b/packages/Algernon.package/ALGCore.class/instance/activate..st
@@ -1,5 +1,6 @@
 visibility
 activate: hand
+
 	self active ifTrue: [^ self].
 	self active: true; 
 		reset;
@@ -12,4 +13,3 @@ activate: hand
 		startStepping.
 	self textField contents: self lastInputString;
 		selectAll
-
diff --git a/packages/Algernon.package/ALGCore.class/instance/clearSearchBar..st b/packages/Algernon.package/ALGCore.class/instance/clearSearchBar..st
@@ -0,0 +1,8 @@
+events-processing
+clearSearchBar: event
+
+	self active 
+		ifFalse: [ ^ false].
+	self query: ''.
+	self updateItemList
+
diff --git a/packages/Algernon.package/ALGCore.class/instance/deactivate..st b/packages/Algernon.package/ALGCore.class/instance/deactivate..st
@@ -1,10 +1,12 @@
 visibility
 deactivate: hand 
+
 	self active ifFalse: [^ self].
 	self lastInputString: self topmostQuery.
 	self active: false;
 		 reset;
 		 stopStepping;
 		 hideMorphs.
 	hand ifNotNil: [self dropFocus: hand].
-	ALGInstallation instance cleanupIfNewDay.
+	ALGInstallation instance cleanupIfNewDay.
+	self resetStatusMessage
diff --git a/packages/Algernon.package/ALGCore.class/instance/delete.st b/packages/Algernon.package/ALGCore.class/instance/delete.st
@@ -1,10 +1,12 @@
 system
 delete
+
 	super delete.
 	self unregisterFromSystem.
 	self background abandon.
 	self breadcrumbs abandon.
 	self textField cleanup.
 	self itemProvider
-		ifNotNil: [ self itemProvider cleanUp. ].
-	self itemList abandon.
+		ifNotNil: [ self itemProvider cleanUp ].
+	self itemList
+	 	ifNotNil: [ self itemList abandon ]
diff --git a/packages/Algernon.package/ALGCore.class/instance/grabFocus..st b/packages/Algernon.package/ALGCore.class/instance/grabFocus..st
@@ -1,4 +1,5 @@
 event handling
 grabFocus: hand
+
 	hand 
-		newKeyboardFocus: self textField.
+		newKeyboardFocus: self textField
diff --git a/packages/Algernon.package/ALGCore.class/instance/resetStatusMessage.st b/packages/Algernon.package/ALGCore.class/instance/resetStatusMessage.st
@@ -0,0 +1,4 @@
+accessing
+resetStatusMessage
+
+	self statusMessage: ''
diff --git a/packages/Algernon.package/ALGCore.class/instance/showChildList.st b/packages/Algernon.package/ALGCore.class/instance/showChildList.st
@@ -1,5 +1,7 @@
 updating
 showChildList
+
+	self resetStatusMessage.
 	(self currentItem hasChildren) ifFalse: [ ^ self ].
 	self breadcrumbs showNavigateBackIcon.
 	self breadcrumbs push: self currentItem.
@@ -8,4 +10,5 @@ showChildList
 	self itemProvider searchLevel: self searchStack size;
 		parentItem: self currentItem.
 	self textField clear.
+	self currentItem updateChildren.
 	self updateItemList
diff --git a/packages/Algernon.package/ALGCore.class/instance/showParentList.st b/packages/Algernon.package/ALGCore.class/instance/showParentList.st
@@ -1,5 +1,7 @@
 updating
 showParentList
+
+	self resetStatusMessage.
 	self searchStack isEmpty ifTrue: [ ^ self ].
 	self searchStack size = 1 ifTrue: [ self breadcrumbs hideNavigateBackIcon ].
 	self breadcrumbs pop.

diff --git a/packages/Algernon.package/ALGCore.class/instance/statusMessage..st b/packages/Algernon.package/ALGCore.class/instance/statusMessage..st
@@ -0,0 +1,4 @@
+accessing
+statusMessage: aString
+
+	statusMessage := aString
diff --git a/packages/Algernon.package/ALGCore.class/instance/statusMessage.st b/packages/Algernon.package/ALGCore.class/instance/statusMessage.st
@@ -0,0 +1,4 @@
+accessing
+statusMessage
+
+	^ statusMessage ifNil: [statusMessage := '']
diff --git a/packages/Algernon.package/ALGCore.class/instance/updateStatusMessage..st b/packages/Algernon.package/ALGCore.class/instance/updateStatusMessage..st
@@ -0,0 +1,5 @@
+updating
+updateStatusMessage: aString
+
+	self statusMessage: aString.
+	self itemList createStatusMessage