hpi-swa-teaching · kdauer · Jun 30, 2022 · Jul 23, 2022 · Jul 23, 2022 · Jul 23, 2022
diff --git a/...oppyPrint-Core.package/PPFormatter.class/class/formatString.class.noPattern.notifying..st b/...oppyPrint-Core.package/PPFormatter.class/class/formatString.class.noPattern.notifying..st
@@ -6,4 +6,4 @@ formatString: aString class: aClass noPattern: aBoolean notifying: anObject
 		class: aClass
 		noPattern: aBoolean
 		notifying: anObject
-		with: PPFormatterConfig default
+		with: PPFormatterConfig preferenceConfig
diff --git a/packages/PoppyPrint-Core.package/PPFormatter.class/methodProperties.json b/packages/PoppyPrint-Core.package/PPFormatter.class/methodProperties.json
@@ -8,8 +8,8 @@
 		"formatMethod:" : "tobe 3/10/2021 13:32",
 		"formatPackage:" : "tobe 3/10/2021 14:59",
 		"formatString:class:noPattern:" : "tobe 3/10/2021 15:47",
-		"formatString:class:noPattern:notifying:" : "KD 6/15/2022 16:11",
-		"formatString:class:noPattern:notifying:with:" : "KD 7/21/2022 18:03",
+		"formatString:class:noPattern:notifying:" : "JW 7/24/2022 19:43",
+		"formatString:class:noPattern:notifying:with:" : "KD 6/15/2022 16:11",
 		"formatString:class:noPattern:with:" : "Alexander Ungefug 6/1/2022 16:06",
 		"stripMethodPattern:" : "tobe 3/19/2021 18:51" },
 	"instance" : {

diff --git a/packages/PoppyPrint-Core.package/PPFormatterConfig.class/class/default.st b/packages/PoppyPrint-Core.package/PPFormatterConfig.class/class/default.st
@@ -1,4 +1,4 @@
-as yet unclassified
+config
 default
 	"Default is lazy initialized"
 

diff --git a/...yPrint-Core.package/PPFormatterConfig.class/class/getClassMethodsWithPragma.inClasses..st b/...yPrint-Core.package/PPFormatterConfig.class/class/getClassMethodsWithPragma.inClasses..st
@@ -0,0 +1,5 @@
+helpers
+getClassMethodsWithPragma: aSymbol inClasses: aClassList
+
+	^ (aClassList gather: [:methodClass | Pragma allNamed: aSymbol in: methodClass class])
+		collect: [:pragma | pragma method]
diff --git a/packages/PoppyPrint-Core.package/PPFormatterConfig.class/class/packageConfigForClass..st b/packages/PoppyPrint-Core.package/PPFormatterConfig.class/class/packageConfigForClass..st
@@ -0,0 +1,4 @@
+config
+packageConfigForClass: aClass
+
+	^ self packageConfigForPackage: aClass packageInfo
diff --git a/packages/PoppyPrint-Core.package/PPFormatterConfig.class/class/packageConfigForMethod..st b/packages/PoppyPrint-Core.package/PPFormatterConfig.class/class/packageConfigForMethod..st
@@ -0,0 +1,4 @@
+config
+packageConfigForMethod: aCompiledMethod
+
+	^ self packageConfigForMethod: aCompiledMethod in: aCompiledMethod methodClass packageInfo
diff --git a/packages/PoppyPrint-Core.package/PPFormatterConfig.class/class/packageConfigForMethod.in..st b/packages/PoppyPrint-Core.package/PPFormatterConfig.class/class/packageConfigForMethod.in..st
@@ -0,0 +1,11 @@
+config
+packageConfigForMethod: aCompiledMethod in: aPackage
+
+	| classesInPackage ppConfigMethods config |
+	classesInPackage := aPackage classes.
+	ppConfigMethods := self getClassMethodsWithPragma: #ppProjectConfig inClasses: classesInPackage.
+	ppConfigMethods size = 0 ifTrue: [^ self default].
+	ppConfigMethods size = 1 ifFalse: [self error: 'More than one Config found in Package: ', aPackage asString].
+	config := ppConfigMethods first methodClass soleInstance perform: ppConfigMethods first selector with: aCompiledMethod.
+	config class = PPFormatterConfig ifFalse: [self error: 'Config returned by ', ppConfigMethods first selector asString,' is not of Type PPFormatterConfig.'].
+	^ config
diff --git a/packages/PoppyPrint-Core.package/PPFormatterConfig.class/class/packageConfigForPackage..st b/packages/PoppyPrint-Core.package/PPFormatterConfig.class/class/packageConfigForPackage..st
@@ -0,0 +1,4 @@
+config
+packageConfigForPackage: aPackage
+
+	^ self packageConfigForMethod: nil in: aPackage
diff --git a/packages/PoppyPrint-Core.package/PPFormatterConfig.class/class/preferenceConfig.st b/packages/PoppyPrint-Core.package/PPFormatterConfig.class/class/preferenceConfig.st
@@ -0,0 +1,6 @@
+config
+preferenceConfig
+
+	self shouldUseDefaultAsPreferenceConfig ifTrue: [^ PPFormatterConfig default].
+	"The Personalized Config is the Default Config for now. In later Issues we want this Method to return the Config specified in the Prefrence Browser."
+	^ PPFormatterConfig default
diff --git a/...pyPrint-Core.package/PPFormatterConfig.class/class/shouldUseDefaultAsPreferenceConfig..st b/...pyPrint-Core.package/PPFormatterConfig.class/class/shouldUseDefaultAsPreferenceConfig..st
@@ -0,0 +1,4 @@
+accessing
+shouldUseDefaultAsPreferenceConfig: aBoolean
+
+	ShouldUseDefaultAsPreferenceConfig := aBoolean
diff --git a/...ppyPrint-Core.package/PPFormatterConfig.class/class/shouldUseDefaultAsPreferenceConfig.st b/...ppyPrint-Core.package/PPFormatterConfig.class/class/shouldUseDefaultAsPreferenceConfig.st
@@ -0,0 +1,4 @@
+accessing
+shouldUseDefaultAsPreferenceConfig
+
+	^ ShouldUseDefaultAsPreferenceConfig ifNil: [ShouldUseDefaultAsPreferenceConfig := false]
diff --git a/packages/PoppyPrint-Core.package/PPFormatterConfig.class/methodProperties.json b/packages/PoppyPrint-Core.package/PPFormatterConfig.class/methodProperties.json
@@ -1,8 +1,16 @@
 {
 	"class" : {
-		"default" : "KD 6/15/2022 16:11" },
+		"default" : "KD 6/15/2022 16:11",
+		"getClassMethodsWithPragma:inClasses:" : "JW 7/25/2022 13:43",
+		"packageConfigForClass:" : "JW 7/25/2022 00:08",
+		"packageConfigForMethod:" : "JW 7/27/2022 11:07",
+		"packageConfigForMethod:in:" : "JW 7/27/2022 11:07",
+		"packageConfigForPackage:" : "JW 7/27/2022 11:08",
+		"preferenceConfig" : "JW 7/24/2022 19:51",
+		"shouldUseDefaultAsPreferenceConfig" : "JW 7/24/2022 19:48",
+		"shouldUseDefaultAsPreferenceConfig:" : "JW 7/24/2022 19:49" },
 	"instance" : {
-		"spaceBeforeComma" : "KD 6/15/2022 16:07",
+		"spaceBeforeComma" : "JW 7/21/2022 17:40",
 		"spaceBeforeComma:" : "YH 6/2/2022 14:16",
 		"spaceBeforePointInArray" : "Alexander Ungefug 6/1/2022 15:59",
 		"spaceBeforePointInArray:" : "YH 6/2/2022 14:17" } }
diff --git a/packages/PoppyPrint-Core.package/PPFormatterConfig.class/properties.json b/packages/PoppyPrint-Core.package/PPFormatterConfig.class/properties.json
@@ -3,7 +3,7 @@
 	"classinstvars" : [
 		 ],
 	"classvars" : [
-		 ],
+		"ShouldUseDefaultAsPreferenceConfig" ],
 	"commentStamp" : "",
 	"instvars" : [
 		"spaceBeforeComma",

diff --git a/...es/PoppyPrint-Core.package/PluggableTextMorphPlus.extension/instance/acceptTextInModel.st b/...es/PoppyPrint-Core.package/PluggableTextMorphPlus.extension/instance/acceptTextInModel.st
@@ -0,0 +1,28 @@
+*PoppyPrint-Core-override
+acceptTextInModel
+
+	| text |
+	self okToStyle ifFalse:[^super acceptTextInModel].			
+	"#correctFrom:to:with: is sent when the method source is
+	manipulated during compilation (removing unused temps,
+	changing selectors etc). But 	#correctFrom:to:with: operates 
+	on the textMorph's text, and we may be saving an unstyled 
+	copy of the text. This means that these corrections will be lost
+	unless we also apply the corrections to the unstyled copy that we are saving.
+		So remember the unstyled copy in unstyledAcceptText, so
+	that when #correctFrom:to:with: is received we can also apply
+	the correction to it"
+	text := textMorph asText.
+	((model respondsTo: #contentsSymbol) and: [model respondsTo: #editSelection]) ifTrue: [
+		(model contentsSymbol = #prettyPrint and: [model editSelection = #newMessage or: [model editSelection = #editMessage]]) ifTrue: [
+			text := PPFormatter
+				formatString: text asString
+				class: model selectedClass
+				noPattern: false
+				with: self getProjectConfig]].
+	unstyledAcceptText := styler unstyledTextFrom: text asText.
+	[^setTextSelector isNil or:
+		[setTextSelector numArgs = 2
+			ifTrue: [model perform: setTextSelector with: unstyledAcceptText with: self]
+			ifFalse: [model perform: setTextSelector with: unstyledAcceptText]]
+	] ensure:[unstyledAcceptText := nil]
diff --git a/...ges/PoppyPrint-Core.package/PluggableTextMorphPlus.extension/instance/getProjectConfig.st b/...ges/PoppyPrint-Core.package/PluggableTextMorphPlus.extension/instance/getProjectConfig.st
@@ -0,0 +1,7 @@
+*PoppyPrint-Core-override
+getProjectConfig
+
+	(model respondsTo: #editSelection) ifFalse: [^ PPFormatterConfig default].
+	model editSelection = #newMessage ifTrue: [^ PPFormatterConfig packageConfigForClass: model selectedClass].
+	model editSelection = #editMessage ifTrue: [^ PPFormatterConfig packageConfigForMethod: model selectedClassOrMetaClass >> model selectedMessageName].
+	^ PPFormatterConfig default.
diff --git a/packages/PoppyPrint-Core.package/PluggableTextMorphPlus.extension/methodProperties.json b/packages/PoppyPrint-Core.package/PluggableTextMorphPlus.extension/methodProperties.json
@@ -0,0 +1,6 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"acceptTextInModel" : "JW 7/25/2022 14:53",
+		"getProjectConfig" : "JW 7/25/2022 14:53" } }
diff --git a/packages/PoppyPrint-Core.package/PluggableTextMorphPlus.extension/properties.json b/packages/PoppyPrint-Core.package/PluggableTextMorphPlus.extension/properties.json
@@ -0,0 +1,2 @@
+{
+	"name" : "PluggableTextMorphPlus" }
diff --git a/...s/PoppyPrint-Tests.package/PPFormatterTest.class/instance/testGetProjectConfigOfMethod.st b/...s/PoppyPrint-Tests.package/PPFormatterTest.class/instance/testGetProjectConfigOfMethod.st
@@ -0,0 +1,6 @@
+tests - projectConfig
+testGetProjectConfigOfMethod
+
+	self
+		assert: (PPSimulationExample poppyConfig: PPSimulationExample >> #example) instanceVariableValues
+		equals: (PPFormatterConfig packageConfigForMethod: PPSimulationExample >> #example) instanceVariableValues
diff --git a/packages/PoppyPrint-Tests.package/PPFormatterTest.class/methodProperties.json b/packages/PoppyPrint-Tests.package/PPFormatterTest.class/methodProperties.json
@@ -23,6 +23,7 @@
 		"testEmptyLineInCaseOf" : "tobe 3/11/2021 10:54",
 		"testEmptyLinesBetweenComments" : "tobe 3/11/2021 11:35",
 		"testEmptyMethod" : "tobe 3/10/2021 14:58",
+		"testGetProjectConfigOfMethod" : "JW 7/24/2022 22:27",
 		"testGithubIssue7" : "tobe 3/11/2021 11:15",
 		"testInlineCommentWithNewline" : "KD 6/15/2022 16:11",
 		"testKeepEmptyLines" : "tobe 3/10/2021 14:58",

diff --git a/packages/PoppyPrint-Tests.package/PPSimulationExample.class/README.md b/packages/PoppyPrint-Tests.package/PPSimulationExample.class/README.md
diff --git a/packages/PoppyPrint-Tests.package/PPSimulationExample.class/class/poppyConfig..st b/packages/PoppyPrint-Tests.package/PPSimulationExample.class/class/poppyConfig..st
@@ -0,0 +1,7 @@
+config
+poppyConfig: aMethod
+	<ppProjectConfig>
+
+	^ PPFormatterConfig default
+		spaceBeforePointInArray: true;
+		spaceBeforeComma: true
diff --git a/packages/PoppyPrint-Tests.package/PPSimulationExample.class/instance/example.st b/packages/PoppyPrint-Tests.package/PPSimulationExample.class/instance/example.st
@@ -0,0 +1,4 @@
+examples
+example
+
+	"This Method will be rewritten in PPSimulationTest"
diff --git a/packages/PoppyPrint-Tests.package/PPSimulationExample.class/methodProperties.json b/packages/PoppyPrint-Tests.package/PPSimulationExample.class/methodProperties.json
@@ -0,0 +1,5 @@
+{
+	"class" : {
+		"poppyConfig:" : "JW 7/24/2022 18:47" },
+	"instance" : {
+		"example" : "JW 7/25/2022 18:24" } }
diff --git a/packages/PoppyPrint-Tests.package/PPSimulationExample.class/properties.json b/packages/PoppyPrint-Tests.package/PPSimulationExample.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "PoppyPrint-Tests",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		 ],
+	"name" : "PPSimulationExample",
+	"pools" : [
+		 ],
+	"super" : "Object",
+	"type" : "normal" }
diff --git a/packages/PoppyPrint-Tests.package/PPSimulationTest.class/README.md b/packages/PoppyPrint-Tests.package/PPSimulationTest.class/README.md
diff --git a/...int-Tests.package/PPSimulationTest.class/instance/accepting.expectingSource.andPretty..st b/...int-Tests.package/PPSimulationTest.class/instance/accepting.expectingSource.andPretty..st
@@ -0,0 +1,11 @@
+helper
+accepting: aString expectingSource: aSourceString andPretty: aPrettyString
+
+	| browser source pretty |
+	browser := self getBrowser.
+	self setMethodContentsTo: aString of: browser using: #prettyPrint.
+	source := self getSourceContentOf: browser.
+	pretty := self getPrettyContentOf: browser.
+	self close: browser.
+	self assert: aSourceString equals: source.
+	self assert: aPrettyString equals: pretty
diff --git a/packages/PoppyPrint-Tests.package/PPSimulationTest.class/instance/close..st b/packages/PoppyPrint-Tests.package/PPSimulationTest.class/instance/close..st
@@ -0,0 +1,9 @@
+helper
+close: aBrowser
+
+	self setMethodContentsTo: 'example
+
+	"This Method will be rewritten in PPSimulationTest"'
+		of: aBrowser
+		using: #source.
+	(aBrowser dependents at: 1) delete
diff --git a/packages/PoppyPrint-Tests.package/PPSimulationTest.class/instance/getBrowser.st b/packages/PoppyPrint-Tests.package/PPSimulationTest.class/instance/getBrowser.st
@@ -0,0 +1,8 @@
+helper
+getBrowser
+
+	| browser |
+	browser := SystemBrowser default open.
+	browser selectClass: PPSimulationExample.
+	browser selectMessageNamed: #example.
+	^ browser
diff --git a/packages/PoppyPrint-Tests.package/PPSimulationTest.class/instance/getPrettyContentOf..st b/packages/PoppyPrint-Tests.package/PPSimulationTest.class/instance/getPrettyContentOf..st
@@ -0,0 +1,6 @@
+helper
+getPrettyContentOf: aBrowser
+
+	aBrowser contentsSymbol: #prettyPrint.
+	aBrowser contents: nil.
+	^ aBrowser contents asString
diff --git a/packages/PoppyPrint-Tests.package/PPSimulationTest.class/instance/getSourceContentOf..st b/packages/PoppyPrint-Tests.package/PPSimulationTest.class/instance/getSourceContentOf..st
@@ -0,0 +1,6 @@
+helper
+getSourceContentOf: aBrowser
+
+	aBrowser contentsSymbol: #source.
+	aBrowser contents: nil.
+	^ aBrowser contents asString
diff --git a/...PoppyPrint-Tests.package/PPSimulationTest.class/instance/setMethodContentsTo.of.using..st b/...PoppyPrint-Tests.package/PPSimulationTest.class/instance/setMethodContentsTo.of.using..st
@@ -0,0 +1,7 @@
+helper
+setMethodContentsTo: aString of: aBrowser using: aSymbol
+
+	aBrowser  contentsSymbol: aSymbol.
+	(aBrowser dependents at: 18) textMorph contents: aString.
+	(aBrowser dependents at: 18) hasUnacceptedEdits: true.
+	(aBrowser dependents at: 18) accept
diff --git a/packages/PoppyPrint-Tests.package/PPSimulationTest.class/instance/setUp.st b/packages/PoppyPrint-Tests.package/PPSimulationTest.class/instance/setUp.st
@@ -0,0 +1,7 @@
+setUp-tearDown
+setUp
+
+	super setUp.
+	PPFormatterConfig shouldUseDefaultAsPreferenceConfig: true.
+	prettyPrinterClassSource := (Behavior >> #prettyPrinterClass) getSourceFromFile string.
+	Behavior compile: 'prettyPrinterClass ^ PPFormatter'.
diff --git a/packages/PoppyPrint-Tests.package/PPSimulationTest.class/instance/tearDown.st b/packages/PoppyPrint-Tests.package/PPSimulationTest.class/instance/tearDown.st
@@ -0,0 +1,5 @@
+setUp-tearDown
+tearDown
+
+	[PPFormatterConfig shouldUseDefaultAsPreferenceConfig: false.
+	Behavior compile: prettyPrinterClassSource] ensure: [super tearDown]
diff --git a/...pyPrint-Tests.package/PPSimulationTest.class/instance/testProjectVsPersonalizedConfig1.st b/...pyPrint-Tests.package/PPSimulationTest.class/instance/testProjectVsPersonalizedConfig1.st
@@ -0,0 +1,10 @@
+tests
+testProjectVsPersonalizedConfig1
+
+	self accepting: 'example
+
+	{#a.#b.#c}' expectingSource: 'example
+
+	{#a . #b . #c}' andPretty: 'example
+
+	{#a. #b. #c}'
diff --git a/...pyPrint-Tests.package/PPSimulationTest.class/instance/testProjectVsPersonalizedConfig2.st b/...pyPrint-Tests.package/PPSimulationTest.class/instance/testProjectVsPersonalizedConfig2.st
@@ -0,0 +1,10 @@
+tests
+testProjectVsPersonalizedConfig2
+
+	self accepting: 'example
+
+	''a'',''b'',''c''' expectingSource: 'example
+
+	''a'' , ''b'' , ''c''' andPretty: 'example
+
+	''a'', ''b'', ''c'''
diff --git a/packages/PoppyPrint-Tests.package/PPSimulationTest.class/methodProperties.json b/packages/PoppyPrint-Tests.package/PPSimulationTest.class/methodProperties.json
@@ -0,0 +1,14 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"accepting:expectingSource:andPretty:" : "JW 7/25/2022 18:24",
+		"close:" : "JW 7/24/2022 19:57",
+		"getBrowser" : "JW 7/24/2022 19:00",
+		"getPrettyContentOf:" : "JW 7/24/2022 19:31",
+		"getSourceContentOf:" : "JW 7/24/2022 19:31",
+		"setMethodContentsTo:of:using:" : "JW 7/24/2022 19:33",
+		"setUp" : "JW 7/25/2022 18:23",
+		"tearDown" : "JW 7/25/2022 18:24",
+		"testProjectVsPersonalizedConfig1" : "JW 7/25/2022 13:40",
+		"testProjectVsPersonalizedConfig2" : "JW 7/25/2022 13:40" } }
diff --git a/packages/PoppyPrint-Tests.package/PPSimulationTest.class/properties.json b/packages/PoppyPrint-Tests.package/PPSimulationTest.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "PoppyPrint-Tests",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		"prettyPrinterClassSource" ],
+	"name" : "PPSimulationTest",
+	"pools" : [
+		 ],
+	"super" : "TestCase",
+	"type" : "normal" }