[ settings ] Use default value instead of assertion

owo-lang · May 10, 2019 · 2b6c7d2 · 2b6c7d2
1 parent cb5c32d
commit 2b6c7d2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/buildSrc/src/generator.kt b/buildSrc/src/generator.kt
@@ -113,9 +113,13 @@ class ${languageName}ProjectSettingsService : PersistentStateComponent<${languag
 }
 
 val Project.${nickname}Settings: ${languageName}ProjectSettingsService
-	get() = ${nickname}SettingsNullable!!
+	get() = ${nickname}SettingsNullable ?: ${languageName}ProjectSettingsService()
 
-/** For building plugin searchable options */
+/**
+ * When building plugin searchable options,
+ * `ServiceManager.getService(this, ${languageName}ProjectSettingsService::class.java)
+ * may return null.
+ */
 val Project.${nickname}SettingsNullable: ${languageName}ProjectSettingsService?
 	get() = ServiceManager.getService(this, ${languageName}ProjectSettingsService::class.java)
 
@@ -135,7 +139,7 @@ internal fun CommonConfigurable.configure$languageName(project: Project) {
 ${if (generateSettings) """
 class ${languageName}ProjectConfigurable(project: Project) : VersionedExecutableProjectConfigurableImpl() {
 	/** For building searchable options */
-	override val settings: ${languageName}Settings = project.${nickname}SettingsNullable?.settings ?: ${languageName}Settings()
+	override val settings: ${languageName}Settings = project.${nickname}Settings.settings
 
 	init {
 		init()

diff --git a/src/org/ice1000/tt/error/error-report.kt b/src/org/ice1000/tt/error/error-report.kt
@@ -50,7 +50,6 @@ import org.eclipse.egit.github.core.RepositoryId
 import org.eclipse.egit.github.core.client.GitHubClient
 import org.eclipse.egit.github.core.service.IssueService
 import org.ice1000.tt.TT_PLUGIN_ID
-import org.ice1000.tt.project.acoreSettingsNullable
 import org.ice1000.tt.project.agdaSettingsNullable
 import org.ice1000.tt.project.minittSettingsNullable
 import org.jetbrains.annotations.NonNls

diff --git a/src/org/ice1000/tt/project/acore.kt b/src/org/ice1000/tt/project/acore.kt
@@ -9,7 +9,7 @@ data class ACoreSettings(
 )
 
 class ACoreProjectConfigurable(project: Project) : OnlyExecutableProjectConfigurable() {
-	private val settings = project.acoreSettingsNullable?.settings ?: ACoreSettings()
+	private val settings = project.acoreSettings.settings
 
 	init {
 		exePathField.text = settings.exePath

diff --git a/src/org/ice1000/tt/project/mlpolyr.kt b/src/org/ice1000/tt/project/mlpolyr.kt
@@ -9,8 +9,7 @@ data class MLPolyRSettings(
 )
 
 class MLPolyRProjectConfigurable(project: Project) : OnlyExecutableProjectConfigurable() {
-	private val settings = project.mlpolyrSettingsNullable?.settings
-		?: MLPolyRSettings()
+	private val settings = project.mlpolyrSettings.settings
 
 	init {
 		exePathField.text = settings.exePath