Merge pull request #96 from hpi-swa-teaching/52-method-label-for-non-…

…formatting-to-master Implementing <ppIgnore> and tests
hpi-swa-teaching · Jul 28, 2022 · 31ea2e7 · 31ea2e7
2 parents f0016f1 + 26c9223
commit 31ea2e7
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 1 deletion.
diff --git a/packages/PoppyPrint-Core.package/MethodNode.extension/instance/hasPragma..st b/packages/PoppyPrint-Core.package/MethodNode.extension/instance/hasPragma..st
@@ -0,0 +1,4 @@
+*PoppyPrint-Core
+hasPragma: aSymbol
+
+	^ self properties includesKey: aSymbol
diff --git a/packages/PoppyPrint-Core.package/MethodNode.extension/methodProperties.json b/packages/PoppyPrint-Core.package/MethodNode.extension/methodProperties.json
@@ -0,0 +1,5 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"hasPragma:" : "KD 7/21/2022 18:01" } }
diff --git a/packages/PoppyPrint-Core.package/MethodNode.extension/properties.json b/packages/PoppyPrint-Core.package/MethodNode.extension/properties.json
@@ -0,0 +1,2 @@
+{
+	"name" : "MethodNode" }
diff --git a/...rint-Core.package/PPFormatter.class/class/formatString.class.noPattern.notifying.with..st b/...rint-Core.package/PPFormatter.class/class/formatString.class.noPattern.notifying.with..st
@@ -14,6 +14,8 @@ formatString: aString class: aClass noPattern: aBoolean notifying: anObject with
 			noPattern: aBoolean
 			notifying: anObject
 			ifFail: nil.
+
+	(methodNode hasPragma: #ppIgnore) ifTrue: [^ aString].
 
 	formatter := self new
 		initForNode: methodNode;

diff --git a/packages/PoppyPrint-Core.package/PPFormatter.class/methodProperties.json b/packages/PoppyPrint-Core.package/PPFormatter.class/methodProperties.json
@@ -9,7 +9,7 @@
 		"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 6/15/2022 16:11",
+		"formatString:class:noPattern:notifying:with:" : "KD 7/21/2022 18:03",
 		"formatString:class:noPattern:with:" : "Alexander Ungefug 6/1/2022 16:06",
 		"stripMethodPattern:" : "tobe 3/19/2021 18:51" },
 	"instance" : {

diff --git a/packages/PoppyPrint-Tests.package/PPFormatterTest.class/instance/testPPIgnore1.st b/packages/PoppyPrint-Tests.package/PPFormatterTest.class/instance/testPPIgnore1.st
@@ -0,0 +1,7 @@
+tests - ppIgnore
+testPPIgnore1
+
+	self canFormat: 'test
+	<ppIgnore>
+	
+	^ 1+   2.'
diff --git a/packages/PoppyPrint-Tests.package/PPFormatterTest.class/instance/testPPIgnore2.st b/packages/PoppyPrint-Tests.package/PPFormatterTest.class/instance/testPPIgnore2.st
@@ -0,0 +1,9 @@
+tests - ppIgnore
+testPPIgnore2
+
+	self canFormat: 'test: a and: b
+	<test1>
+	<ppIgnore>
+	<test2>
+	
+	^ 1+   2.'
diff --git a/packages/PoppyPrint-Tests.package/PPFormatterTest.class/instance/testPPIgnore3.st b/packages/PoppyPrint-Tests.package/PPFormatterTest.class/instance/testPPIgnore3.st
@@ -0,0 +1,11 @@
+tests - ppIgnore
+testPPIgnore3
+
+	self canFormat: 'test: a and: b
+	
+	
+	<test>
+	<ppIgnore>
+	<ppIgnore>
+	
+	^ 1+   2.'
diff --git a/packages/PoppyPrint-Tests.package/PPFormatterTest.class/methodProperties.json b/packages/PoppyPrint-Tests.package/PPFormatterTest.class/methodProperties.json
@@ -38,6 +38,9 @@
 		"testNestedTrailingComment" : "tobe 3/11/2021 10:16",
 		"testObjectMethods" : "KD 6/15/2022 16:11",
 		"testOnlyLastArgumentIsLong" : "tobe 3/10/2021 15:27",
+		"testPPIgnore1" : "JW 6/25/2022 09:55",
+		"testPPIgnore2" : "JW 6/25/2022 09:56",
+		"testPPIgnore3" : "JW 6/25/2022 09:57",
 		"testParenthesisAroundReceiver" : "tobe 3/11/2021 13:07",
 		"testPragmas" : "KD 6/15/2022 16:11",
 		"testReindentMultilineComment" : "tobe 3/11/2021 10:08",