From 54a22738e66c08481793a3ef4db249e398b02324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= <sergej@koscejev.cz>
Date: Thu, 2 Nov 2023 21:48:27 +0100
Subject: [PATCH] Fix broken references

---
 build.gradle                                  |  4 +-
 ...a.lint.generic.linters_library.modules.mps | 46 +++++++++----------
 ....linters_library.performance_generator.mps | 10 ++--
 .../org.mpsqa.lint.generic.sandbox.msd        |  4 +-
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4a9c95b6..d521ea2b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,7 +56,7 @@ ext.dependencyRepositories = [
 ]
 
 // Dependency versions
-ext.mpsVersion =  '2022.2'
+ext.mpsVersion =  '2022.2.1'
 
 // Project versions
 ext.major = '2022'
@@ -295,4 +295,4 @@ clean.dependsOn cleanMps
 
 defaultTasks 'build'
 
-task rebuild(dependsOn:[clean, build_allInOne_package])
\ No newline at end of file
+task rebuild(dependsOn:[clean, build_allInOne_package])
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.modules.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.modules.mps
index 440fded4..ddb26b39 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.modules.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.modules.mps
@@ -5087,19 +5087,14 @@
                   <node concept="3cpWsn" id="4Wm$DJ9k$1I" role="3cpWs9">
                     <property role="TrG5h" value="moduleFile" />
                     <node concept="3uibUv" id="4Wm$DJ9kzVm" role="1tU5fm">
-                      <ref role="3uigEE" to="guwi:~File" resolve="File" />
-                    </node>
-                    <node concept="2ShNRf" id="4Wm$DJ9k$1J" role="33vP2m">
-                      <node concept="1pGfFk" id="4Wm$DJ9k$1K" role="2ShVmc">
-                        <ref role="37wK5l" to="guwi:~File.&lt;init&gt;(java.lang.String)" resolve="File" />
-                        <node concept="2OqwBi" id="4Wm$DJ9k$1L" role="37wK5m">
-                          <node concept="2GrUjf" id="4Wm$DJ9k$1M" role="2Oq$k0">
-                            <ref role="2Gs0qQ" node="4Wm$DJ9hQM6" resolve="m" />
-                          </node>
-                          <node concept="liA8E" id="4Wm$DJ9k$1N" role="2OqNvi">
-                            <ref role="37wK5l" to="y8s3:~ModulePath.getPath()" resolve="getPath" />
-                          </node>
-                        </node>
+                      <ref role="3uigEE" to="3ju5:~IFile" resolve="IFile" />
+                    </node>
+                    <node concept="2OqwBi" id="5_tEjp$tKvN" role="33vP2m">
+                      <node concept="2GrUjf" id="5_tEjp$tKdv" role="2Oq$k0">
+                        <ref role="2Gs0qQ" node="4Wm$DJ9hQM6" resolve="m" />
+                      </node>
+                      <node concept="liA8E" id="5_tEjp$tN6W" role="2OqNvi">
+                        <ref role="37wK5l" to="y8s3:~ModulePath.getFile()" resolve="getFile" />
                       </node>
                     </node>
                   </node>
@@ -5119,7 +5114,7 @@
                                   <ref role="3cqZAo" node="4Wm$DJ9k$1I" resolve="moduleFile" />
                                 </node>
                                 <node concept="liA8E" id="4Wm$DJ9kC0o" role="2OqNvi">
-                                  <ref role="37wK5l" to="guwi:~File.getAbsolutePath()" resolve="getAbsolutePath" />
+                                  <ref role="37wK5l" to="3ju5:~IFile.getPath()" resolve="getPath" />
                                 </node>
                               </node>
                               <node concept="Xl_RD" id="4Wm$DJ9hQMN" role="3uHU7B">
@@ -5140,23 +5135,28 @@
                         <ref role="3cqZAo" node="4Wm$DJ9k$1I" resolve="moduleFile" />
                       </node>
                       <node concept="liA8E" id="4Wm$DJ9k_i$" role="2OqNvi">
-                        <ref role="37wK5l" to="guwi:~File.exists()" resolve="exists" />
+                        <ref role="37wK5l" to="3ju5:~IFile.exists()" resolve="exists" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="2OqwBi" id="4Wm$DJ9kp$H" role="2GsD0m">
-                <node concept="1eOMI4" id="4Wm$DJ9kp$I" role="2Oq$k0">
-                  <node concept="10QFUN" id="4Wm$DJ9kp$J" role="1eOMHV">
-                    <node concept="1MG55F" id="4Wm$DJ9kp$K" role="10QFUP" />
-                    <node concept="3uibUv" id="4Wm$DJ9kp$L" role="10QFUM">
-                      <ref role="3uigEE" to="z1c5:~StandaloneMPSProject" resolve="StandaloneMPSProject" />
+              <node concept="2OqwBi" id="5_tEjp$tIz9" role="2GsD0m">
+                <node concept="2OqwBi" id="4Wm$DJ9kp$H" role="2Oq$k0">
+                  <node concept="1eOMI4" id="4Wm$DJ9kp$I" role="2Oq$k0">
+                    <node concept="10QFUN" id="4Wm$DJ9kp$J" role="1eOMHV">
+                      <node concept="1MG55F" id="4Wm$DJ9kp$K" role="10QFUP" />
+                      <node concept="3uibUv" id="4Wm$DJ9kp$L" role="10QFUM">
+                        <ref role="3uigEE" to="z1c5:~StandaloneMPSProject" resolve="StandaloneMPSProject" />
+                      </node>
                     </node>
                   </node>
+                  <node concept="liA8E" id="4Wm$DJ9kp$M" role="2OqNvi">
+                    <ref role="37wK5l" to="z1c5:~StandaloneMPSProject.getProjectDescriptor()" resolve="getProjectDescriptor" />
+                  </node>
                 </node>
-                <node concept="liA8E" id="4Wm$DJ9kp$M" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c5:~StandaloneMPSProject.getAllModulePaths()" resolve="getAllModulePaths" />
+                <node concept="liA8E" id="5_tEjp$tIVe" role="2OqNvi">
+                  <ref role="37wK5l" to="y8s3:~ProjectDescriptor.getModulePaths()" resolve="getModulePaths" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.mps_lang.linters_library.performance_generator.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.mps_lang.linters_library.performance_generator.mps
index ea0cfd36..a6ec21a2 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.mps_lang.linters_library.performance_generator.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.mps_lang.linters_library.performance_generator.mps
@@ -19,7 +19,6 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="yyf4" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.util(MPS.OpenAPI/)" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
-    <import index="ap4t" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.generator(MPS.Core/)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
     <import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" />
@@ -33,6 +32,7 @@
     <import index="hfuk" ref="r:b25dd364-bc3f-4a66-97d1-262009610c5e(jetbrains.mps.make)" />
     <import index="drpk" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.make(MPS.Platform/)" />
     <import index="i9so" ref="r:9e5578e0-37f0-4c9b-a301-771bcb453678(jetbrains.mps.make.script)" />
+    <import index="ap4t" ref="215c4c45-ba99-49f5-9ab7-4b6901a63cfd/java:jetbrains.mps.generator(MPS.Generator/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -237,7 +237,7 @@
           <node concept="3cpWsn" id="58oUBCRuVQb" role="3cpWs9">
             <property role="TrG5h" value="defaults" />
             <node concept="3uibUv" id="58oUBCRuVQc" role="1tU5fm">
-              <ref role="3uigEE" to="ap4t:~GenerationOptions$OptionsBuilder" resolve="GenerationOptions.OptionsBuilder" />
+              <ref role="3uigEE" to="ap4t:~GenerationOptions$OptionsBuilder" resolve="OptionsBuilder" />
             </node>
             <node concept="1rXfSq" id="2_w5$M95pBq" role="33vP2m">
               <ref role="37wK5l" node="5Q23ZugPJfh" resolve="defaultOptionsBuilder" />
@@ -309,7 +309,7 @@
           <node concept="3cpWsn" id="2_w5$M95ngB" role="3cpWs9">
             <property role="TrG5h" value="defaults" />
             <node concept="3uibUv" id="2_w5$M95ngC" role="1tU5fm">
-              <ref role="3uigEE" to="ap4t:~GenerationOptions$OptionsBuilder" resolve="GenerationOptions.OptionsBuilder" />
+              <ref role="3uigEE" to="ap4t:~GenerationOptions$OptionsBuilder" resolve="OptionsBuilder" />
             </node>
             <node concept="2YIFZM" id="2_w5$M95ngD" role="33vP2m">
               <ref role="37wK5l" to="ap4t:~GenerationOptions.getDefaults()" resolve="getDefaults" />
@@ -351,7 +351,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="2_w5$M95l9k" role="3clF45">
-        <ref role="3uigEE" to="ap4t:~GenerationOptions$OptionsBuilder" resolve="GenerationOptions.OptionsBuilder" />
+        <ref role="3uigEE" to="ap4t:~GenerationOptions$OptionsBuilder" resolve="OptionsBuilder" />
       </node>
       <node concept="3Tm1VV" id="2_w5$M95jgT" role="1B3o_S" />
     </node>
@@ -444,7 +444,7 @@
       <node concept="37vLTG" id="2_w5$M94NFG" role="3clF46">
         <property role="TrG5h" value="defaults" />
         <node concept="3uibUv" id="2_w5$M94NFH" role="1tU5fm">
-          <ref role="3uigEE" to="ap4t:~GenerationOptions$OptionsBuilder" resolve="GenerationOptions.OptionsBuilder" />
+          <ref role="3uigEE" to="ap4t:~GenerationOptions$OptionsBuilder" resolve="OptionsBuilder" />
         </node>
         <node concept="2AHcQZ" id="2_w5$M9gELP" role="2AJF6D">
           <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/org.mpsqa.lint.generic.sandbox.msd b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/org.mpsqa.lint.generic.sandbox.msd
index e95cdbdb..84e5981f 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/org.mpsqa.lint.generic.sandbox.msd
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/org.mpsqa.lint.generic.sandbox.msd
@@ -19,7 +19,7 @@
     <dependency reexport="false">40ab19e9-751a-4433-b645-0e65160e58a0(org.mpsqa.lint.generic)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
     <dependency reexport="false">a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)</dependency>
-    <dependency reexport="false">12a40499-ed72-4b23-9437-358c4217c97b(org.mpsqa.lint.mps_lang.linters_library)</dependency>
+    <dependency reexport="false">215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -47,6 +47,7 @@
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+    <module reference="215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator)" version="0" />
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
@@ -60,7 +61,6 @@
     <module reference="40ab19e9-751a-4433-b645-0e65160e58a0(org.mpsqa.lint.generic)" version="0" />
     <module reference="a86f8e91-0c59-4691-a7ce-49b7e2c7c3a9(org.mpsqa.lint.generic.linters_library)" version="0" />
     <module reference="6ce900c0-bfaf-49ef-a192-9b1044b1ac55(org.mpsqa.lint.generic.sandbox)" version="0" />
-    <module reference="12a40499-ed72-4b23-9437-358c4217c97b(org.mpsqa.lint.mps_lang.linters_library)" version="0" />
   </dependencyVersions>
 </solution>