chore: reformat files and rename classes according to KTLint

modelix · Feb 20, 2024 · e4d5544 · e4d5544
1 parent 3294acb
commit e4d5544
Show file tree

Hide file tree

Showing 15 changed files with 14 additions and 20 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,10 @@
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.kt]
+# Disables the `class-naming` because classes previously generated from MPS uses underscores.
+ktlint_standard_class-naming = disabled
diff --git a/mps-legacy-sync-plugin/build.gradle.kts b/mps-legacy-sync-plugin/build.gradle.kts
@@ -164,7 +164,7 @@ tasks {
         doLast {
             val ignoredFiles = setOf(
                 "META-INF/MANIFEST.MF",
-                "org/modelix/model/mpsplugin/AllowedBinaryIncompatibilityKt.class"
+                "org/modelix/model/mpsplugin/AllowedBinaryIncompatibilityKt.class",
             )
             fun loadEntries(fileName: String) = rootProject.layout.buildDirectory
                 .dir("binary-compatibility")

diff --git a/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsadapters/mps/SModelAsNode.kt b/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsadapters/mps/SModelAsNode.kt
@@ -4,7 +4,6 @@ import jetbrains.mps.baseLanguage.closures.runtime.Wrappers._T
 import jetbrains.mps.internal.collections.runtime.CollectionSequence
 import jetbrains.mps.internal.collections.runtime.ISelector
 import jetbrains.mps.internal.collections.runtime.ListSequence
-import jetbrains.mps.internal.collections.runtime.NotNullWhereFilter
 import jetbrains.mps.internal.collections.runtime.Sequence
 import jetbrains.mps.smodel.DefaultSModelDescriptor
 import jetbrains.mps.smodel.MPSModuleRepository

diff --git a/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsadapters/mps/SModuleAsNode.kt b/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsadapters/mps/SModuleAsNode.kt
@@ -1,14 +1,12 @@
 package org.modelix.model.mpsadapters.mps
 
 import jetbrains.mps.baseLanguage.closures.runtime.Wrappers._T
-import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes._return_P1_E0
 import jetbrains.mps.internal.collections.runtime.CollectionSequence
 import jetbrains.mps.internal.collections.runtime.IMapping
 import jetbrains.mps.internal.collections.runtime.ISelector
 import jetbrains.mps.internal.collections.runtime.IWhereFilter
 import jetbrains.mps.internal.collections.runtime.ListSequence
 import jetbrains.mps.internal.collections.runtime.MapSequence
-import jetbrains.mps.internal.collections.runtime.NotNullWhereFilter
 import jetbrains.mps.internal.collections.runtime.Sequence
 import jetbrains.mps.project.AbstractModule
 import jetbrains.mps.project.DevKit

diff --git a/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsadapters/mps/SRepositoryAsNode.kt b/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsadapters/mps/SRepositoryAsNode.kt
@@ -1,10 +1,8 @@
 package org.modelix.model.mpsadapters.mps
 
-import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes._return_P1_E0
 import jetbrains.mps.internal.collections.runtime.ISelector
 import jetbrains.mps.internal.collections.runtime.IWhereFilter
 import jetbrains.mps.internal.collections.runtime.ListSequence
-import jetbrains.mps.internal.collections.runtime.NotNullWhereFilter
 import jetbrains.mps.internal.collections.runtime.Sequence
 import jetbrains.mps.project.MPSProject
 import jetbrains.mps.project.Project

diff --git a/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/CloudIcons.kt b/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/CloudIcons.kt
@@ -1,7 +1,6 @@
 package org.modelix.model.mpsplugin
 
 import com.intellij.ui.JBColor
-import java.awt.Color
 import javax.swing.Icon
 
 /*Generated by MPS */

diff --git a/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/CommandHelper.kt b/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/CommandHelper.kt
@@ -2,13 +2,11 @@ package org.modelix.model.mpsplugin
 
 import com.intellij.openapi.application.ApplicationManager
 import jetbrains.mps.baseLanguage.closures.runtime.Wrappers._T
-import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes._return_P1_E0
 import jetbrains.mps.baseLanguage.tuples.runtime.MultiTuple
 import jetbrains.mps.baseLanguage.tuples.runtime.Tuples
 import jetbrains.mps.ide.ThreadUtils
 import jetbrains.mps.internal.collections.runtime.ISelector
 import jetbrains.mps.internal.collections.runtime.ListSequence
-import jetbrains.mps.internal.collections.runtime.NotNullWhereFilter
 import jetbrains.mps.project.Project
 import jetbrains.mps.project.ProjectManager
 import jetbrains.mps.smodel.MPSModuleRepository

diff --git a/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/ModelCloudExporter.kt b/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/ModelCloudExporter.kt
@@ -320,7 +320,7 @@ class ModelCloudExporter {
     /**
      * We had to copy it from https://github.com/JetBrains/MPS/blob/14b86a2f987cdd3fbcc72b9262e8b388f7a5fae3/core/persistence/source/jetbrains/mps/persistence/DefaultModelPersistence.java#L115
      */
-    private class PersistenceFacility /*package*/(modelFactory: DefaultModelPersistence?, dataSource: StreamDataSource?) :
+    private class PersistenceFacility(modelFactory: DefaultModelPersistence?, dataSource: StreamDataSource?) :
         LazyLoadFacility((modelFactory)!!, (dataSource)!!, true) {
         private val source0: StreamDataSource
             private get() {

diff --git a/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/ModelServerConnection.kt b/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/ModelServerConnection.kt
@@ -2,7 +2,6 @@ package org.modelix.model.mpsplugin
 
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.project.ProjectManager
 import com.intellij.openapi.project.ProjectManagerListener
 import com.intellij.util.messages.MessageBusConnection
 import io.ktor.client.HttpClient

diff --git a/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/ModelServerConnections.kt b/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/ModelServerConnections.kt
@@ -5,7 +5,6 @@ import jetbrains.mps.internal.collections.runtime.ISelector
 import jetbrains.mps.internal.collections.runtime.ITranslator2
 import jetbrains.mps.internal.collections.runtime.IWhereFilter
 import jetbrains.mps.internal.collections.runtime.ListSequence
-import jetbrains.mps.internal.collections.runtime.NotNullWhereFilter
 import jetbrains.mps.internal.collections.runtime.Sequence
 import jetbrains.mps.internal.collections.runtime.SetSequence
 import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations

diff --git a/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/history/LoadingIcon.kt b/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/history/LoadingIcon.kt
@@ -1,14 +1,11 @@
 package org.modelix.model.mpsplugin.history
 
 import com.intellij.ui.Gray
-import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes._return_P1_E0
 import jetbrains.mps.ide.ui.tree.MPSTree
 import jetbrains.mps.ide.ui.tree.MPSTreeNode
 import jetbrains.mps.internal.collections.runtime.ISelector
-import jetbrains.mps.internal.collections.runtime.NotNullWhereFilter
 import jetbrains.mps.internal.collections.runtime.SetSequence
 import java.awt.BasicStroke
-import java.awt.Color
 import java.awt.Component
 import java.awt.Graphics
 import java.awt.Graphics2D

diff --git a/...gacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/history/ModelServerTreeNode.kt b/...gacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/history/ModelServerTreeNode.kt
@@ -2,12 +2,10 @@ package org.modelix.model.mpsplugin.history
 
 import jetbrains.mps.ide.ThreadUtils
 import jetbrains.mps.ide.ui.tree.TextTreeNode
-import jetbrains.mps.internal.collections.runtime.IListSequence
 import jetbrains.mps.internal.collections.runtime.ISelector
 import jetbrains.mps.internal.collections.runtime.IVisitor
 import jetbrains.mps.internal.collections.runtime.ListSequence
 import jetbrains.mps.internal.collections.runtime.MapSequence
-import jetbrains.mps.internal.collections.runtime.NotNullWhereFilter
 import jetbrains.mps.internal.collections.runtime.Sequence
 import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations
 import jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations

diff --git a/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/plugin/AddBranch_Action.kt b/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/plugin/AddBranch_Action.kt
@@ -74,7 +74,7 @@ class AddBranch_Action : BaseAction("New Branch", "", ICON) {
                     SPropertyOperations.getString(
                         branchTreeNode.branchInfo,
                         PROPS.`name$MnvL`,
-                    )
+                    ),
                 ).getKey(),
             ]
             modelServer.getClient().put(repositoryId.getBranchReference(name).getKey(), versionHash)

diff --git a/...plugin/src/main/java/org/modelix/model/mpsplugin/projectview/CloudProjectViewExtension.kt b/...plugin/src/main/java/org/modelix/model/mpsplugin/projectview/CloudProjectViewExtension.kt
@@ -31,7 +31,6 @@ import org.jetbrains.mps.openapi.module.SRepositoryListenerBase
 import org.modelix.model.mpsplugin.CloudTransientModule
 import org.modelix.model.mpsplugin.LetterInSquareIcon
 import org.modelix.model.mpsplugin.history.TreeModelUtil
-import java.awt.Color
 import java.awt.event.ActionEvent
 import java.awt.event.ActionListener
 import java.util.concurrent.atomic.AtomicBoolean

diff --git a/mps-legacy-sync-plugin/src/main/kotlin/org/modelix/mps/sync/ModelixSyncPluginInitializer.kt b/mps-legacy-sync-plugin/src/main/kotlin/org/modelix/mps/sync/ModelixSyncPluginInitializer.kt
@@ -22,7 +22,7 @@ import com.intellij.openapi.startup.StartupActivity
 
 class ModelixSyncPluginInitializer : StartupActivity.Background {
     override fun runActivity(project: Project) {
-        //service<ModelSyncService>().registerProject(project)
+        // service<ModelSyncService>().registerProject(project)
         ApplicationManager.getApplication().getService(ModelSyncService::class.java).registerProject(project)
     }
 }