Fix PureGitFile editor/contents confusion and reimplement AbstractFil…

…eReference>>#gtEditorView reuse
feenkcom · Nov 6, 2024 · ab57026 · ab57026
1 parent 1c11d58
commit ab57026
Showing 1 changed file with 11 additions and 21 deletions.
diff --git a/src/GToolkit4Git/PureGitFile.extension.st b/src/GToolkit4Git/PureGitFile.extension.st
@@ -71,21 +71,6 @@ PureGitFile >> gtBlameFor: composite [
 			weight: 2.0
 ]
 
-{ #category : #'*GToolkit4Git' }
-PureGitFile >> gtContentsFor: composite [
-	<gtView>
-	| text |
-	[ text := self contents ] 
-		on: ZnCharacterEncodingError 
-		do: [ ^ composite empty ].
-	^ composite textEditor
-		title: 'Contents';
-		priority: 30;
-		tooltip: 'Current contents in work tree on file system';
-		glamorousCodeFontAndSize;
-		text: [ text ]
-]
-
 { #category : #'*GToolkit4Git' }
 PureGitFile >> gtDetails [
 	^ super gtDetails , {
@@ -107,12 +92,17 @@ PureGitFile >> gtEditorFor: composite [
 	[ text := self contents ] 
 		on: ZnCharacterEncodingError 
 		do: [ ^ composite empty ].
-	^ composite forward
-		title: 'Editor';
-		priority: 35;
-		tooltip: 'Edit current contents in work tree on file system';
-		object: [ self fileReference ];
-		view: #gtContentsFor:
+	^ composite explicit
+		title: 'Contents';
+		priority: 30;
+		tooltip: 'Current contents in work tree on file system';
+		stencil: [ | pane |
+			pane := self fileReference gtEditorView.
+			pane
+				childNamed: #editor
+				ifFound: [ :editor |
+					editor aptitude: BrGlamorousCodeEditorAptitude ].
+			pane ]
 ]
 
 { #category : #'*GToolkit4Git' }