dc: add impl of Truediff diffing algo, dc/lsp: add hover

hpi-swa-lab · Nov 6, 2023 · 792874a · 792874a
1 parent 3980ae1
commit 792874a
Show file tree

Hide file tree

Showing 28 changed files with 1,034 additions and 50 deletions.
diff --git a/.squot b/.squot
@@ -22,5 +22,6 @@ OrderedDictionary {
 	'packages/Sandblocks-Wing' : #SquotTonelSerializer,
 	'packages/DomainCode-Parser' : #SquotTonelSerializer,
 	'packages/DomainCode-Core' : #SquotTonelSerializer,
-	'packages/DomainCode-Diff' : #SquotTonelSerializer
+	'packages/DomainCode-Diff' : #SquotTonelSerializer,
+	'packages/DomainCode-Truediff' : #SquotTonelSerializer
 }
diff --git a/packages/DomainCode-Core/DCFileEditor.class.st b/packages/DomainCode-Core/DCFileEditor.class.st
@@ -10,7 +10,7 @@ Class {
 { #category : #'as yet unclassified' }
 DCFileEditor >> file [
 
-	^ self firstSubmorph firstSubmorph firstSubmorph
+	^ self childSandblocks first
 ]
 
 { #category : #'as yet unclassified' }
@@ -38,19 +38,44 @@ DCFileEditor >> file: aFile [
 			yourself)
 ]
 
+{ #category : #'as yet unclassified' }
+DCFileEditor >> filepath [
+
+	^ file asString
+]
+
+{ #category : #'as yet unclassified' }
+DCFileEditor >> getSourceStringAndMark [
+	"for compatibility with lsp"
+
+	^ self file sourceString
+]
+
 { #category : #'as yet unclassified' }
 DCFileEditor >> isArtefact [
 
 	^ true
 ]
 
+{ #category : #'as yet unclassified' }
+DCFileEditor >> languageSemanticsFor: aBlock [
+
+	^ self owner languageSemanticsFor: aBlock
+]
+
 { #category : #'as yet unclassified' }
 DCFileEditor >> reloadArtefact [
 	<action>
 
 	self replaceBy: (DCFileEditor new file: file)
 ]
 
+{ #category : #'as yet unclassified' }
+DCFileEditor >> root [
+
+	^ self file
+]
+
 { #category : #'as yet unclassified' }
 DCFileEditor >> saveTryFixing: aFixBoolean quick: aQuickBoolean [
 

diff --git a/packages/DomainCode-Core/DCProjectView.class.st b/packages/DomainCode-Core/DCProjectView.class.st
@@ -2,11 +2,19 @@ Class {
 	#name : #DCProjectView,
 	#superclass : #SBBlock,
 	#instVars : [
-		'files'
+		'files',
+		'languageSemantics',
+		'project'
 	],
 	#category : #'DomainCode-Core'
 }
 
+{ #category : #'as yet unclassified' }
+DCProjectView class >> on: aFilePathString [
+
+	^ self new project: (DCProject new directory: (FileDirectory on: aFilePathString))
+]
+
 { #category : #'as yet unclassified' }
 DCProjectView class >> queryOpenProject: aRoot [
 	<domainQuery>
@@ -17,6 +25,12 @@ DCProjectView class >> queryOpenProject: aRoot [
 		ifNone: []
 ]
 
+{ #category : #'as yet unclassified' }
+DCProjectView >> languageSemanticsFor: aBlock [
+
+	^ {#args. aBlock. languageSemantics}
+]
+
 { #category : #'as yet unclassified' }
 DCProjectView >> openFile: aFile [
 
@@ -27,6 +41,8 @@ DCProjectView >> openFile: aFile [
 { #category : #'as yet unclassified' }
 DCProjectView >> project: aProject [
 
+	project := aProject.
+
 	self
 		changeTableLayout;
 		hResizing: #rigid;
@@ -43,3 +59,16 @@ DCProjectView >> project: aProject [
 		ifFound: [:rootFile | files addMorphBack: ((SBFileTree new on: rootFile) when: #open send: #openFile: to: self)]
 		ifNone: []
 ]
+
+{ #category : #'as yet unclassified' }
+DCProjectView >> startPythonLSP [
+	<action>
+
+	languageSemantics := SBTSLSPSemantics new
+		on: project directory
+		transport: (SBLSPStdioTransport new
+			command: (SBTSLanguageRuntime which: 'pylsp');
+			arguments: {};
+			workingDirectory: project directory asString)
+		onReady: []
+]
diff --git a/packages/DomainCode-Core/Morph.extension.st b/packages/DomainCode-Core/Morph.extension.st
@@ -110,6 +110,12 @@ Morph >> isReplacement [
 	^ false
 ]
 
+{ #category : #'*DomainCode-Core' }
+Morph >> onlyChildrenDo: aBlock [
+
+	self childrenDo: [:c | c allChildrenDo: aBlock]
+]
+
 { #category : #'*DomainCode-Core' }
 Morph >> purpose [
 

diff --git a/packages/DomainCode-Core/SBBlock.extension.st b/packages/DomainCode-Core/SBBlock.extension.st
@@ -0,0 +1,8 @@
+Extension { #name : #SBBlock }
+
+{ #category : #'*DomainCode-Core' }
+SBBlock >> languageSemanticsFor: aBlock [
+
+
+	^ nil
+]