Merge pull request #746 from JetBrains/merge/mps20213

Merge maintenance/mps20213 into maintenance/mps20222

.gitignore

@@ -1,15 +1,18 @@
-classes_gen
-source_gen
-source_gen.caches
-test_gen.caches
-workspace.xml
-artifacts
-tmp
+classes_gen/
+source_gen/
+source_gen.caches/
+test_gen/
+test_gen.caches/
+
+**/.mps/workspace.xml
+
+/artifacts/
+/tmp/
+
 .gradle/
-build/generated/
-build/mps/
+
 /build/
-test_gen/
+
 site
 .DS_Store
 .gradletasknamecache
@@ -21,11 +24,12 @@ site
 markdown-navigator**
 model-api/build
 code/model-api/org.modelix.model.api/lib
-scripts/.mps-caches
-.idea/modules
+.mps-caches/
 
 # Generated during the build
 /kotlin-js-store/
 
 # Generated by statistics plugin
 code/dependencies.txt
+.idea/
+*.iml