diff --git a/.squot b/.squot index eb37a5ad..fc4d5b3d 100644 --- a/.squot +++ b/.squot @@ -1,25 +1,25 @@ OrderedDictionary { - 'packages/Sandblocks-Representation' : #SquotTonelSerializer, - 'packages/Sandblocks-Explorer' : #SquotTonelSerializer, - 'packages/Sandblocks-Compiler' : #SquotTonelSerializer, - 'packages/Sandblocks-Tutorial' : #SquotTonelSerializer, - 'packages/Sandblocks-Watch' : #SquotTonelSerializer, 'packages/BaselineOfSandblocks' : #SquotTonelSerializer, - 'packages/Sandblocks-Core' : #SquotTonelSerializer, - 'packages/Sandblocks-Drawing' : #SquotTonelSerializer, - 'packages/Sandblocks-Graph' : #SquotTonelSerializer, 'packages/Sandblocks-Babylonian' : #SquotTonelSerializer, + 'packages/Sandblocks-Compiler' : #SquotTonelSerializer, + 'packages/Sandblocks-Core' : #SquotTonelSerializer, + 'packages/Sandblocks-CustomJavascript' : #SquotTonelSerializer, 'packages/Sandblocks-Debugger' : #SquotTonelSerializer, + 'packages/Sandblocks-Drawing' : #SquotTonelSerializer, + 'packages/Sandblocks-Explorer' : #SquotTonelSerializer, 'packages/Sandblocks-Layout' : #SquotTonelSerializer, 'packages/Sandblocks-Morphs' : #SquotTonelSerializer, - 'packages/Sandblocks-Utils' : #SquotTonelSerializer, - 'packages/Sandblocks-RatPack' : #SquotTonelSerializer, - 'packages/Sandblocks-Smalltalk' : #SquotTonelSerializer, 'packages/Sandblocks-Ohm' : #SquotTonelSerializer, - 'packages/Sandblocks-CustomJavascript' : #SquotTonelSerializer, - 'packages/Sandblocks-Squeak6Fixes' : #SquotTonelSerializer, - 'packages/Sandblocks-Simulation' : #SquotTonelSerializer, + 'packages/Sandblocks-Representation' : #SquotTonelSerializer, 'packages/Sandblocks-Scheme' : #SquotTonelSerializer, + 'packages/Sandblocks-Simulation' : #SquotTonelSerializer, + 'packages/Sandblocks-Smalltalk' : #SquotTonelSerializer, + 'packages/Sandblocks-Squeak6Fixes' : #SquotTonelSerializer, + 'packages/Sandblocks-Tutorial' : #SquotTonelSerializer, + 'packages/Sandblocks-Utils' : #SquotTonelSerializer, + 'packages/Sandblocks-Watch' : #SquotTonelSerializer, + 'packages/Sandblocks-Graph' : #SquotTonelSerializer, + 'packages/Sandblocks-RatPack' : #SquotTonelSerializer, 'packages/Sandblocks-Plugin-StLivePreview' : #SquotTonelSerializer, 'packages/Sandblocks-Git' : #SquotTonelSerializer } \ No newline at end of file diff --git a/packages/Sandblocks-Smalltalk/SBStGrammarHandler.class.st b/packages/Sandblocks-Smalltalk/SBStGrammarHandler.class.st index 61193cac..2896cbf2 100644 --- a/packages/Sandblocks-Smalltalk/SBStGrammarHandler.class.st +++ b/packages/Sandblocks-Smalltalk/SBStGrammarHandler.class.st @@ -272,7 +272,7 @@ SBStGrammarHandler >> perform: char for: aBlock empty: aBoolean [ char = $$ ifTrue: [^ self replace: aBlock with: (SBStCharacter new contents: '')]. char = $' ifTrue: [^ self replace: aBlock with: (SBStString new contents: '')]. char = $# ifTrue: [^ self replace: aBlock with: (SBStSymbol new contents: '')]. - char = $" ifTrue: [^ self replace: aBlock with: self newCommentBlock]. + (char = $" and: [aBlock parentSandblock isBlockBody]) ifTrue: [^ self replace: aBlock with: self newCommentBlock]. ((char = Character space or: [char = Character cr]) and: [aBlock isStatement]) ifTrue: [^ self emptyLine: aBlock]. (char = $: and: [aBlock parentSandblock isBlockBody and: [aBlock parentSandblock isMethodBody not]]) ifTrue: [ | block | block := aBlock parentSandblock.