From 33cb150cf0def92fbe7c1f3ea0902fbb94073984 Mon Sep 17 00:00:00 2001
From: Veit Heller <veit@veitheller.de>
Date: Tue, 14 Jun 2022 16:25:53 +0200
Subject: [PATCH] Be better on startup

---
 src/Carp/CarpModuleCoderElement.class.st      |  3 +-
 src/Carp/GtCarpNewFunctionCoderModel.class.st |  3 ++
 src/Carp/LeCarpApplicationStrategy.class.st   | 31 +------------------
 3 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/src/Carp/CarpModuleCoderElement.class.st b/src/Carp/CarpModuleCoderElement.class.st
index c85a383..9e275e0 100644
--- a/src/Carp/CarpModuleCoderElement.class.st
+++ b/src/Carp/CarpModuleCoderElement.class.st
@@ -15,8 +15,7 @@ Class {
 { #category : #accessing }
 CarpModuleCoderElement >> build [
 	| application commandFactory |
-	application := CarpApplication uniqueInstance.
-	application isRunning ifFalse: [ application start ].
+	application := CarpApplication start.
 	commandFactory := application newCommandFactory.
 
 	^ commandFactory
diff --git a/src/Carp/GtCarpNewFunctionCoderModel.class.st b/src/Carp/GtCarpNewFunctionCoderModel.class.st
index 184330a..1ed8f5f 100644
--- a/src/Carp/GtCarpNewFunctionCoderModel.class.st
+++ b/src/Carp/GtCarpNewFunctionCoderModel.class.st
@@ -10,6 +10,9 @@ Class {
 
 { #category : #accessing }
 GtCarpNewFunctionCoderModel >> initializeAddOns: addOns [
+	addOns
+		addStyler: (GtCoderAstSmaCCParserStyler new smaccStyler: CarpParser gtStyler).
+
 	addOns
 		addMainAction: 'Save' translated
 		icon: BrGlamorousVectorIcons accept
diff --git a/src/Carp/LeCarpApplicationStrategy.class.st b/src/Carp/LeCarpApplicationStrategy.class.st
index 0e2891b..2a934a5 100644
--- a/src/Carp/LeCarpApplicationStrategy.class.st
+++ b/src/Carp/LeCarpApplicationStrategy.class.st
@@ -13,8 +13,6 @@ LeCarpApplicationStrategy class >> strategyName [
 { #category : #accessing }
 LeCarpApplicationStrategy >> applicationServer [
 
-	CarpApplication uniqueInstance ifNil:
-		[ CarpApplication uniqueInstance: self newCarpApplication ].
 	^ CarpApplication uniqueInstance
 ]
 
@@ -26,32 +24,5 @@ LeCarpApplicationStrategy >> applicationSettings [
 	^ CarpApplication isRunning ifTrue:
 		[ CarpApplication uniqueInstance settings ]
 	ifFalse:
-		[ self updatedSettings: CarpApplication defaultSettings ]
-]
-
-{ #category : #accessing }
-LeCarpApplicationStrategy >> newCarpApplication [
-
-	^ CarpApplication new initializeWith: 
-		(self updatedSettings: LanguageLinkSettings carpDefaultSettings)
-
-]
-
-{ #category : #accessing }
-LeCarpApplicationStrategy >> updatedSettings: applicationCarpSettings [
-	"Update the supplied settings with the lepiter configuration"
-
-	| lepiterCarpSettings lepiterDatabase carpDir |
-	lepiterDatabase := content database.
-	(lepiterDatabase isKindOf: LeNullDatabase)
-		ifTrue: [ ^ applicationCarpSettings ].
-	lepiterCarpSettings := lepiterDatabase properties carpLinkSettings.
-	lepiterCarpSettings directory
-		ifNotNil: [ :relativeDir | 
-			carpDir := lepiterDatabase localStoreRootDirectory resolve: relativeDir.
-			applicationCarpSettings workingDirectory: carpDir ].	"lepiterCarpSettings carpPath ifNotNil:
-		[ :carpPath | applicationCarpSettings serverExecutable: carpPath ]."
-	applicationCarpSettings serverDebugMode: lepiterCarpSettings serverDebugMode.
-
-	^ applicationCarpSettings
+		[ CarpApplication defaultSettings ]
 ]