core: fixes to block-collapse-by-default

hpi-swa-lab · Sep 22, 2023 · 9230635 · 9230635
1 parent aedf2da
commit 9230635
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 6 deletions.
diff --git a/packages/Sandblocks-TreeSitter/SBFileEditor.class.st b/packages/Sandblocks-TreeSitter/SBFileEditor.class.st
@@ -9,6 +9,12 @@ Class {
 	#category : #'Sandblocks-TreeSitter-Files'
 }
 
+{ #category : #'as yet unclassified' }
+SBFileEditor class >> for: aPath [
+
+	self openProject: aPath
+]
+
 { #category : #'as yet unclassified' }
 SBFileEditor class >> openProject: aPath [
 
@@ -119,7 +125,7 @@ SBFileEditor >> openFile: aFile [
 	aFile isDirectory ifFalse: [ | newFile |
 		newFile := (SBToggledCode
 			comment: ''
-			active: 2
+			active: 1
 			do: {[SBTSFile forNoReplace: aFile pathString]. [SBTSFile for: aFile pathString]}) ifNil: [^ nil].
 		self openMorphInView: newFile.
 		self runtimesDo: [:r | r didOpen: newFile].

diff --git a/packages/Sandblocks-TreeSitter/SBTSCollapsed.class.st b/packages/Sandblocks-TreeSitter/SBTSCollapsed.class.st
@@ -25,7 +25,7 @@ SBTSCollapsed >> block: aBlock [
 { #category : #'as yet unclassified' }
 SBTSCollapsed >> color [
 
-	^ block color
+	^ self parentSandblock drawnColor
 ]
 
 { #category : #'as yet unclassified' }
@@ -41,10 +41,18 @@ SBTSCollapsed >> initialize [
 
 	self
 		layoutInset: 2;
-		changeTableLayout;
+		layoutPolicy: SBAlgebraLayout new;
 		cellGap: 4
 ]
 
+{ #category : #'as yet unclassified' }
+SBTSCollapsed >> layoutCommands [
+
+	^ SBAlgebraCommand container
+		data: {self firstSubmorph layoutCommands};
+		morph: self
+]
+
 { #category : #'as yet unclassified' }
 SBTSCollapsed >> printOn: aStream [
 

diff --git a/packages/Sandblocks-TreeSitter/SBTSLanguage.class.st b/packages/Sandblocks-TreeSitter/SBTSLanguage.class.st
@@ -59,9 +59,10 @@ SBTSLanguage class >> canParse: aString [
 
 { #category : #configuration }
 SBTSLanguage class >> collapseAll: aBlock [
-	"can be implemented by the respective languages"
+	<action>
 
-
+	aBlock allMorphsDepthFirstDo: [:m | (m isTSBlock and: [m class ~= SBTSCollapsed and: [self shouldCollapse: m]]) ifTrue: [m replaceBy: (SBTSCollapsed new block: m)]].
+	^ aBlock
 ]
 
 { #category : #configuration }
@@ -569,6 +570,12 @@ SBTSLanguage class >> scopesAround: aBlock do: aClosure [
 		current := current parentSandblock]
 ]
 
+{ #category : #'as yet unclassified' }
+SBTSLanguage class >> shouldCollapse: aBlock [
+
+	^ false
+]
+
 { #category : #configuration }
 SBTSLanguage class >> shouldSkipParsing: aTypeString cursor: aCursor [
 

diff --git a/packages/Sandblocks-TreeSitter/SBVisExample.class.st b/packages/Sandblocks-TreeSitter/SBVisExample.class.st
@@ -6,7 +6,7 @@ Class {
 
 { #category : #'as yet unclassified' }
 SBVisExample >> build [
-	<lang: #typescript match: '(call_expression (arguments . (expression) @render (string (string_fragment) @color)))' sample: 'visualize(random_points(), "red")' keyword: 'visualize'>
+	<lang: #typescript match: '(call_expression (identifier) ="random_points" (arguments . (expression) @render (string (string_fragment) @color)))' sample: 'visualize(random_points(), "red")' keyword: 'visualize'>
 
 	self layoutInset: 4.
 	self addMorphBack: (self createBindingBlock: 'render').

diff --git a/packages/Sandblocks-Typescript/SBTypescript.class.st b/packages/Sandblocks-Typescript/SBTypescript.class.st
@@ -11160,6 +11160,12 @@ SBTypescript class >> rootRuleName [
 	^ 'program'
 ]
 
+{ #category : #configuration }
+SBTypescript class >> shouldCollapse: aBlock [
+
+	^ aBlock type = #'statement_block'
+]
+
 { #category : #configuration }
 SBTypescript class >> softLineBreakBetween: aBlock and: anotherBlock [