Merge f32deb1 into 463f7e7

hpi-swa-teaching · Aug 7, 2020 · adb2618 · adb2618
2 parents 463f7e7 + f32deb1
commit adb2618
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 3 deletions.
diff --git a/...s/BaselineOfRichTextEditing.package/BaselineOfRichTextEditing.class/instance/baseline..st b/...s/BaselineOfRichTextEditing.package/BaselineOfRichTextEditing.class/instance/baseline..st
@@ -7,9 +7,12 @@ baseline: spec
 			spec baseline: 'MorphicTestingFramework' with: [
 				spec
 					repository: 'github://hpi-swa-teaching/Morphic-Testing-Framework:master/packages'].
+			spec baseline: 'Autocompletion' with: [
+				spec
+					repository: 'github://MrModder/Autocompletion:master/packages'].
 			spec
 				package: 'RichTextEditing-Core' with: [spec postLoadDoIt: #initializeCharacterScanner];
-				package: 'RichTextEditing-Tests' with: [spec requires: #('RichTextEditing-Core' 'MorphicTestingFramework')]
+				package: 'RichTextEditing-Tests' with: [spec requires: #('RichTextEditing-Core' 'MorphicTestingFramework' 'Autocompletion')]
 				yourself.
 			spec
 				group: 'default' with: #('RichTextEditing-Core');

diff --git a/...s/BaselineOfRichTextEditing.package/BaselineOfRichTextEditing.class/methodProperties.json b/...s/BaselineOfRichTextEditing.package/BaselineOfRichTextEditing.class/methodProperties.json
@@ -2,6 +2,6 @@
 	"class" : {
 		 },
 	"instance" : {
-		"baseline:" : "lh 7/24/2019 20:53",
+		"baseline:" : "frc 7/3/2020 21:32",
 		"initializeCharacterScanner" : "LM 5/26/2019 22:58",
 		"projectClass" : "frc 7/3/2020 10:18" } }
diff --git a/...Editing-Core.package/RichTextEditorModel.class/instance/initializeCompletionController.st b/...Editing-Core.package/RichTextEditorModel.class/instance/initializeCompletionController.st
@@ -0,0 +1,6 @@
+initialize-release
+initializeCompletionController
+
+	^ self wantsAutocompletion
+		ifTrue: [self addDependent: self createCompletionController]
+		ifFalse: [nil]
diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/methodProperties.json
@@ -51,6 +51,7 @@
 		"hasStructure:" : "AG 7/25/2019 13:13",
 		"hasStructure:between:to:" : "frc 8/7/2020 11:29",
 		"hasUnacceptedEdits" : "ls 5/9/2019 10:34",
+		"initializeCompletionController" : "frc 7/3/2020 21:49",
 		"help" : "frc 8/7/2020 13:51",
 		"importFileFrom:" : "frc 8/6/2020 20:08",
 		"importFileWithDialog" : "tok 7/3/2020 18:50",

diff --git a/.../RichTextEditing-Tests.package/RichTextEditorTests.class/instance/enableAutocompletion.st b/.../RichTextEditing-Tests.package/RichTextEditorTests.class/instance/enableAutocompletion.st
@@ -0,0 +1,5 @@
+utilities
+enableAutocompletion
+
+	autocompletionPreference := RichTextEditorModel autocompletion.
+	RichTextEditorModel autocompletion: true.
diff --git a/...RichTextEditing-Tests.package/RichTextEditorTests.class/instance/restoreAutocompletion.st b/...RichTextEditing-Tests.package/RichTextEditorTests.class/instance/restoreAutocompletion.st
@@ -0,0 +1,4 @@
+utilities
+restoreAutocompletion
+
+	RichTextEditorModel autocompletion: autocompletionPreference
diff --git a/...age/RichTextEditorTests.class/instance/testInitializeCompletionControllerAddsDependent.st b/...age/RichTextEditorTests.class/instance/testInitializeCompletionControllerAddsDependent.st
@@ -0,0 +1,10 @@
+unit-tests
+testInitializeCompletionControllerAddsDependent
+
+	| testModel |
+	self enableAutocompletion.
+	testModel := RichTextEditorModel basicNew.
+	self assert: (testModel dependents isEmpty).
+	testModel initializeCompletionController.
+	self deny: (testModel dependents isEmpty).
+	self restoreAutocompletion
diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/methodProperties.json
@@ -13,6 +13,7 @@
 		"deselectOptionBold" : "tok 8/4/2020 16:55",
 		"editorSavesIncludeKey:" : "MB 5/22/2019 18:01",
 		"editorStructureKeymap" : "tok 8/7/2020 11:17",
+		"enableAutocompletion" : "frc 7/3/2020 21:45",
 		"enterSaveNameInDialog:" : "tok 7/9/2020 21:57",
 		"exportAsButtonLabel" : "tok 7/8/2020 16:28",
 		"footerContainsColNumber" : "JEH 6/14/2020 12:43",
@@ -32,6 +33,7 @@
 		"regExFoundInFooter:" : "JEH 6/14/2020 12:43",
 		"registeredOpenCommandsOfWorldMenuIncludes:" : "MB 5/15/2019 21:27",
 		"removeStructure" : "ls 7/24/2019 17:24",
+		"restoreAutocompletion" : "frc 7/3/2020 21:46",
 		"richTextEditorOpenCommand" : "ls 6/22/2019 10:49",
 		"saveAsButtonLabel" : "frc 8/7/2020 10:55",
 		"saveName" : "MB 7/25/2019 11:02",
@@ -41,12 +43,13 @@
 		"simulateRedoShortcut" : "tok 8/4/2020 15:23",
 		"simulateUndoShortcut" : "tok 8/3/2020 14:59",
 		"structureEditorLabel" : "frc 8/1/2020 11:31",
-		"structureKeymap" : " 8/7/2020 14:44:52",
+		"structureKeymap" : "8/7/2020 14:44:52",
 		"structureKeymap:" : "tok 8/7/2020 11:24",
 		"structureKeymapPreference" : "tok 8/7/2020 10:04",
 		"tearDown" : "tok 8/7/2020 11:11",
 		"templateButtonLabel" : "frc 8/1/2020 11:55",
 		"testDocumentInfoContainsWordcount" : "7/16/2020 10:20:56",
+		"testInitializeCompletionControllerAddsDependent" : "frc 8/7/2020 15:55",
 		"testInspectDocument" : "JEH 8/3/2020 15:03",
 		"testOpenStructureEditor" : "frc 8/1/2020 11:36",
 		"testOpenTemplateEditor" : "frc 8/1/2020 11:55",

diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/properties.json b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/properties.json
@@ -6,6 +6,7 @@
 		 ],
 	"commentStamp" : "lh 7/25/2019 12:05",
 	"instvars" : [
+		"autocompletionPreference",
 		"structureKeymap" ],
 	"name" : "RichTextEditorTests",
 	"pools" : [