carpentry/gt4carp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Be better on startup

Browse Source
This commit is contained in:
Veit Heller
2022-06-14 16:25:53 +02:00
parent 66fe79f2bf
commit 33cb150cf0
3 changed files with 5 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Carp/CarpModuleCoderElement.class.st
View File

@@ -15,8 +15,7 @@ Class {
{ #category : #accessing } { #category : #accessing }
CarpModuleCoderElement >> build [ CarpModuleCoderElement >> build [
| application commandFactory | | application commandFactory |
application := CarpApplication uniqueInstance. application := CarpApplication start.
application isRunning ifFalse: [ application start ].
commandFactory := application newCommandFactory. commandFactory := application newCommandFactory.
^ commandFactory ^ commandFactory

3
src/Carp/GtCarpNewFunctionCoderModel.class.st
View File

@@ -10,6 +10,9 @@ Class {
{ #category : #accessing } { #category : #accessing }
GtCarpNewFunctionCoderModel >> initializeAddOns: addOns [ GtCarpNewFunctionCoderModel >> initializeAddOns: addOns [
addOns
addStyler: (GtCoderAstSmaCCParserStyler new smaccStyler: CarpParser gtStyler).
addOns addOns
addMainAction: 'Save' translated addMainAction: 'Save' translated
icon: BrGlamorousVectorIcons accept icon: BrGlamorousVectorIcons accept

31
src/Carp/LeCarpApplicationStrategy.class.st
View File

@@ -13,8 +13,6 @@ LeCarpApplicationStrategy class >> strategyName [
{ #category : #accessing } { #category : #accessing }
LeCarpApplicationStrategy >> applicationServer [ LeCarpApplicationStrategy >> applicationServer [
CarpApplication uniqueInstance ifNil:
[ CarpApplication uniqueInstance: self newCarpApplication ].
^ CarpApplication uniqueInstance ^ CarpApplication uniqueInstance
] ]
@@ -26,32 +24,5 @@ LeCarpApplicationStrategy >> applicationSettings [
^ CarpApplication isRunning ifTrue: ^ CarpApplication isRunning ifTrue:
[ CarpApplication uniqueInstance settings ] [ CarpApplication uniqueInstance settings ]
ifFalse: ifFalse:
[ self updatedSettings: CarpApplication defaultSettings ] [ 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
] ]