50709

18052 Reformatting a method should never break the code https://pharo.fogbugz.com/f/cases/18052 http://files.pharo.org/image/50/50709.zip
pharo-project · Apr 22, 2016 · f259099 · f259099
1 parent 0eff1af
commit f259099
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 45 deletions.
diff --git a/...package/BIConfigurableFormatter.class/class/accessing/cascadedMessageInsideParentheses.st b/...package/BIConfigurableFormatter.class/class/accessing/cascadedMessageInsideParentheses.st
diff --git a/...ackage/BIConfigurableFormatter.class/class/accessing/cascadedMessageInsideParentheses_.st b/...ackage/BIConfigurableFormatter.class/class/accessing/cascadedMessageInsideParentheses_.st
diff --git a/BlueInk-Core.package/BIConfigurableFormatter.class/class/settings/settingsOn_.st b/BlueInk-Core.package/BIConfigurableFormatter.class/class/settings/settingsOn_.st
@@ -7,10 +7,6 @@ settingsOn: aBuilder
 		description: 'Settings related to the formatter';
 		with:
 				[ 
-			(aBuilder setting: #cascadedMessageInsideParentheses)
-				label: 'Cascaded message inside parentheses';
-				description:
-					(BIFormatSettingsExample >> #cascadedMessageInsideParenthesesExample) sourceCode.
 			(aBuilder setting: #formatCommentWithStatements) label: 'Format comment with statements'.
 			(aBuilder setting: #indentString) label: 'Indent string'.
 			(aBuilder setting: #indentsForKeywords) label: 'Indents for keywords'.

diff --git a/...kage/BIConfigurableFormatter.class/instance/accessing/cascadedMessageInsideParentheses.st b/...kage/BIConfigurableFormatter.class/instance/accessing/cascadedMessageInsideParentheses.st
diff --git a/...age/BIConfigurableFormatter.class/instance/accessing/cascadedMessageInsideParentheses_.st b/...age/BIConfigurableFormatter.class/instance/accessing/cascadedMessageInsideParentheses_.st
diff --git a/BlueInk-Core.package/BIConfigurableFormatter.class/instance/private/needsParenthesisFor_.st b/BlueInk-Core.package/BIConfigurableFormatter.class/instance/private/needsParenthesisFor_.st
@@ -4,8 +4,10 @@ needsParenthesisFor: aNode
 	aNode isValue
 		ifFalse: [ ^ false ].
 	parent := aNode parent ifNil: [ ^ false ].
-	(self cascadedMessageInsideParentheses
-		and: [ aNode isMessage and: [ parent isMessage and: [ parent receiver == aNode ] ] ])
+	(aNode isMessage and: [ 
+		parent isMessage and: [ 
+		parent receiver == aNode and:[
+		aNode selector isUnary not ] ] ])
 		ifTrue: [ 
 			grandparent := parent parent.
 			(grandparent notNil and: [ grandparent isCascade ])

diff --git a/BlueInk-Core.package/BIConfigurableFormatter.class/instance/visiting/visitCascadeNode_.st b/BlueInk-Core.package/BIConfigurableFormatter.class/instance/visiting/visitCascadeNode_.st
@@ -1,4 +1,5 @@
 visitCascadeNode: aCascadeNode
+	1haltOnce.
 	self isInCascadeNode: true.
 	self visitNode: aCascadeNode receiver.
 	self

diff --git a/BlueInk-Core.package/BIPrettyPrinterContext.class/definition.st b/BlueInk-Core.package/BIPrettyPrinterContext.class/definition.st
@@ -1,5 +1,5 @@
 Object subclass: #BIPrettyPrinterContext
-	instanceVariableNames: 'cascadedMessageInsideParentheses formatCommentWithStatements indentString indentsForKeywords keepBlockInMessage lineUpBlockBrackets maxLineLength methodSignatureOnMultipleLines minimumNewLinesBetweenStatements multiLineMessages newLineAfterCascade newLineBeforeFirstCascade newLineBeforeFirstKeyword newLinesAfterMethodComment newLinesAfterMethodPattern newLinesAfterTemporaries numberOfArgumentsForMultiLine oneLineMessages periodsAtEndOfBlock periodsAtEndOfMethod retainBlankLinesBetweenStatements retainBlankLinesBeforeComments stringFollowingReturn stringInsideBlocks stringInsideParentheses useTraditionalBinaryPrecedenceForParentheses selectorAndArgumentCombinedMaxSize useBasicCommentFormat traditionalBinaryPrecedenceArray'
+	instanceVariableNames: 'formatCommentWithStatements indentString indentsForKeywords keepBlockInMessage lineUpBlockBrackets maxLineLength methodSignatureOnMultipleLines minimumNewLinesBetweenStatements multiLineMessages newLineAfterCascade newLineBeforeFirstCascade newLineBeforeFirstKeyword newLinesAfterMethodComment newLinesAfterMethodPattern newLinesAfterTemporaries numberOfArgumentsForMultiLine oneLineMessages periodsAtEndOfBlock periodsAtEndOfMethod retainBlankLinesBetweenStatements retainBlankLinesBeforeComments stringFollowingReturn stringInsideBlocks stringInsideParentheses useTraditionalBinaryPrecedenceForParentheses selectorAndArgumentCombinedMaxSize useBasicCommentFormat traditionalBinaryPrecedenceArray'
 	classVariableNames: ''
 	poolDictionaries: ''
 	category: 'BlueInk-Core'
diff --git a/...ckage/BIPrettyPrinterContext.class/instance/accessing/cascadedMessageInsideParentheses.st b/...ckage/BIPrettyPrinterContext.class/instance/accessing/cascadedMessageInsideParentheses.st
diff --git a/...kage/BIPrettyPrinterContext.class/instance/accessing/cascadedMessageInsideParentheses_.st b/...kage/BIPrettyPrinterContext.class/instance/accessing/cascadedMessageInsideParentheses_.st
diff --git a/...ConfigurableFormatterTest.class/instance/test/testInstallDoesNotAffectAllTheFormatters.st b/...ConfigurableFormatterTest.class/instance/test/testInstallDoesNotAffectAllTheFormatters.st
diff --git a/...s/instance/pharo - scripts/script50708.st → ...s/instance/pharo - scripts/script50709.st b/...s/instance/pharo - scripts/script50708.st → ...s/instance/pharo - scripts/script50709.st
@@ -1,4 +1,4 @@
-script50708
+script50709
 
 	^ 'AST-Core-TheIntegrator.411.mcz
 AST-FFI-Pharo50Compatibility-EstebanLorenzano.1.mcz
@@ -20,9 +20,9 @@ BaselineOfFileTree-ThierryGoubier.15.mcz
 BaselineOfMetacello-EstebanLorenzano.89.mcz
 BaselineOfQualityAssistant-YuriyTymchuk.46.mcz
 BaselineOfRenraku-YuriyTymchuk.5.mcz
-BlueInk-Core-TheIntegrator.18.mcz
+BlueInk-Core-TheIntegrator.20.mcz
 BlueInk-Extras-TheIntegrator.8.mcz
-BlueInk-Tests-TheIntegrator.8.mcz
+BlueInk-Tests-TheIntegrator.10.mcz
 Chroma-CubeHelix-TheIntegrator.2.mcz
 CodeExport-TheIntegrator.17.mcz
 CodeImport-TheIntegrator.83.mcz
@@ -219,9 +219,9 @@ Network-Url-MarcusDenker.99.mcz
 NewValueHolder-TheIntegrator.33.mcz
 NodeNavigation-TheIntegrator.53.mcz
 NonInteractiveTranscript-TheIntegrator.25.mcz
-OSWindow-Core-RonieSalgado.103.mcz
+OSWindow-Core-RonieSalgado.104.mcz
 OSWindow-SDL2-RonieSalgado.95.mcz
-OSWindow-SDL2-Examples-RonieSalgado.11.mcz
+OSWindow-SDL2-Examples-RonieSalgado.12.mcz
 OSWindow-Tests-TheIntegrator.2.mcz
 OSWindow-VM-MerwanOuddane.4.mcz
 OpalCompiler-Core-TheIntegrator.793.mcz

diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50708.st b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50708.st
diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50709.st b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50709.st
@@ -0,0 +1,15 @@
+update50709
+	"self new update50709"
+	SmalltalkImage compilerClass: Compiler.
+.
+	self withUpdateLog: '18052 Reformatting a method should never break the code
+	https://pharo.fogbugz.com/f/cases/18052
+
+'.
+	self loadTogether: self script50709 merge: false.
+	SmalltalkImage compilerClass: OpalCompiler.
+#('BlueInk-Core' 'BlueInk-Tests') do: [ :pckgName | 
+	(RPackageOrganizer default packageNamed: pckgName)
+		classes do: [ :cl | cl compileAll ] ].
+	self flushCaches.
+self cleanRepositories.
diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st b/ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st
@@ -1,3 +1,5 @@
 commentForCurrentUpdate
- ^ '18057 Two tests for OSWindow now failing on Linux and Win
-	https://pharo.fogbugz.com/f/cases/18057'
+ ^ '18052 Reformatting a method should never break the code
+	https://pharo.fogbugz.com/f/cases/18052
+
+'