chore: fix format after main merge

Rebasing would have been too complicated.

Author: languitar

model-api-gen-gradle-test/src/test/kotlin/GeneratedApiTest.kt

@@ -5,9 +5,13 @@ import jetbrains.mps.baseLanguage.jdk8.SuperInterfaceMethodCall_old
 import jetbrains.mps.lang.behavior.C_ConceptMethodDeclaration
 import jetbrains.mps.lang.behavior.ConceptMethodDeclaration
 import jetbrains.mps.lang.core.L_jetbrains_mps_lang_core
+import jetbrains.mps.lang.editor.C_FontStyleStyleClassItem
+import jetbrains.mps.lang.editor.L_jetbrains_mps_lang_editor
+import jetbrains.mps.lang.editor._FontStyle_Enum
 import org.modelix.metamodel.IPropertyValueEnum
 import org.modelix.metamodel.TypedLanguagesRegistry
 import org.modelix.metamodel.typed
+import org.modelix.metamodel.untyped
 import org.modelix.model.ModelFacade
 import org.modelix.model.api.INode
 import org.modelix.model.api.getRootNode

model-api-gen-gradle/src/main/kotlin/org/modelix/metamodel/gradle/GenerateMetaModelSources.kt

@@ -99,7 +99,7 @@ abstract class GenerateMetaModelSources @Inject constructor(of: ObjectFactory) :
             val generator = MetaModelGenerator(
                 kotlinOutputDir.toPath(),
                 nameConfig.get(),
-                this.modelqlKotlinOutputDir.orNull?.asFile?.toPath()
+                this.modelqlKotlinOutputDir.orNull?.asFile?.toPath(),
             )
             generator.generate(processedLanguages)
             registrationHelperName.orNull?.let {

model-client/src/commonTest/kotlin/org/modelix/model/TreeDiffTest.kt

@@ -26,6 +26,7 @@ import org.modelix.model.persistent.MapBaseStore
 import org.modelix.model.persistent.SerializationUtil
 import kotlin.random.Random
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class TreeDiffTest {
 

model-server/src/test/java/org/modelix/model/server/RestModelServerTest.java

@@ -15,16 +15,15 @@
 
 package org.modelix.model.server;
 
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.HashSet;
 import org.json.JSONArray;
 import org.junit.Test;
 import org.modelix.model.server.handlers.KeyValueLikeModelServer;
 import org.modelix.model.server.store.InMemoryStoreClient;
 
-import java.util.Arrays;
-import java.util.HashSet;
-
-import static org.junit.Assert.assertEquals;
-
 public class RestModelServerTest {
 
     @Test

model-server/src/test/java/org/modelix/model/server/functionaltests/Stepdefs.java

@@ -15,6 +15,8 @@
 
 package org.modelix.model.server.functionaltests;
 
+import static org.junit.Assert.*;
+
 import com.google.common.base.Charsets;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
@@ -23,12 +25,6 @@
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.sse.InboundSseEvent;
-import javax.ws.rs.sse.SseEventSource;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -43,8 +39,11 @@
 import java.util.concurrent.Executors;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-
-import static org.junit.Assert.*;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.sse.InboundSseEvent;
+import javax.ws.rs.sse.SseEventSource;
 
 public class Stepdefs {