Move typesystem2.helper.plugin to typechecking.plugin. Drop typesystem2.helper solution.
This commit is contained in:
Fedor Isakov
parent
804cc9140b
commit
aac95b2b25
|
|
@ -18,7 +18,6 @@
|
|||
<modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl" folder="typesystem2" />
|
||||
<modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl" folder="typesystem2" />
|
||||
<modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd" folder="typesystem2" />
|
||||
<modulePath path="$PROJECT_DIR$/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/jetbrains.mps.lang.typesystem2.helper.msd" folder="typesystem2" />
|
||||
<modulePath path="$PROJECT_DIR$/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd" folder="typesystem2" />
|
||||
</projectModules>
|
||||
</component>
|
||||
|
|
|
|||
175
build.xml
175
build.xml
|
|
@ -399,49 +399,6 @@
|
|||
<zipfileset file="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd" prefix="module" />
|
||||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/typesystem2-solutions-jetbrains.mps.lang.typesystem2.template-models" prefix="module/models" />
|
||||
</jar>
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.helper.jar" />
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.helper.jar/META-INF" />
|
||||
<echoxml file="${build.tmp}/default/jetbrains.mps.lang.typesystem2.helper.jar/META-INF/module.xml">
|
||||
<module namespace="jetbrains.mps.lang.typesystem2.helper" type="solution" uuid="274c9cfa-1024-4444-904c-f2f1383a35da">
|
||||
<dependencies>
|
||||
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
|
||||
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
|
||||
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
|
||||
<module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
|
||||
<module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
|
||||
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
|
||||
<module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
|
||||
<module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
|
||||
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
|
||||
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
|
||||
<module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
|
||||
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
|
||||
</dependencies>
|
||||
<classpath>
|
||||
<entry path="." />
|
||||
</classpath>
|
||||
<sources jar="jetbrains.mps.lang.typesystem2.helper-src.jar" descriptor="jetbrains.mps.lang.typesystem2.helper.msd" />
|
||||
</module>
|
||||
</echoxml>
|
||||
<jar destfile="${build.layout}/tests/jetbrains.mps.lang.typesystem2.helper.jar" duplicate="preserve">
|
||||
<fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.helper" />
|
||||
<fileset dir="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper" includes="icons/**, resources/**" />
|
||||
<fileset dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
|
||||
<fileset dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.helper.jar" />
|
||||
</jar>
|
||||
<copyModels todir="${build.tmp}/customProcessors/copyModels/typesystem2-solutions-jetbrains.mps.lang.typesystem2.helper-models">
|
||||
<fileset dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
|
||||
</copyModels>
|
||||
<jar destfile="${build.layout}/tests/jetbrains.mps.lang.typesystem2.helper-src.jar" duplicate="preserve">
|
||||
<fileset dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/source_gen">
|
||||
<exclude name="**/trace.info" />
|
||||
<exclude name="**/exports" />
|
||||
<exclude name="**/checkpoints" />
|
||||
<exclude name="**/*.mps" />
|
||||
</fileset>
|
||||
<zipfileset file="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/jetbrains.mps.lang.typesystem2.helper.msd" prefix="module" />
|
||||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/typesystem2-solutions-jetbrains.mps.lang.typesystem2.helper-models" prefix="module/models" />
|
||||
</jar>
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.jar" />
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.jar/META-INF" />
|
||||
<echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.jar/META-INF/module.xml">
|
||||
|
|
@ -450,6 +407,7 @@
|
|||
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
|
||||
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
|
||||
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
|
||||
<module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
|
||||
<module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
|
||||
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
|
||||
<module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
|
||||
|
|
@ -457,6 +415,7 @@
|
|||
<module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
|
||||
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
|
||||
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
|
||||
<module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
|
||||
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
|
||||
</dependencies>
|
||||
<library jar="lib/reactive-streams-1.0.0.final.jar" />
|
||||
|
|
@ -1220,49 +1179,6 @@
|
|||
<zipfileset file="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd" prefix="module" />
|
||||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/typesystem2-solutions-jetbrains.mps.lang.typesystem2.template-models1" prefix="module/models" />
|
||||
</jar>
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.helper.jar1" />
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.helper.jar1/META-INF" />
|
||||
<echoxml file="${build.tmp}/default/jetbrains.mps.lang.typesystem2.helper.jar1/META-INF/module.xml">
|
||||
<module namespace="jetbrains.mps.lang.typesystem2.helper" type="solution" uuid="274c9cfa-1024-4444-904c-f2f1383a35da">
|
||||
<dependencies>
|
||||
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
|
||||
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
|
||||
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
|
||||
<module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
|
||||
<module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
|
||||
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
|
||||
<module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
|
||||
<module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
|
||||
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
|
||||
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
|
||||
<module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
|
||||
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
|
||||
</dependencies>
|
||||
<classpath>
|
||||
<entry path="." />
|
||||
</classpath>
|
||||
<sources jar="jetbrains.mps.lang.typesystem2.helper-src.jar" descriptor="jetbrains.mps.lang.typesystem2.helper.msd" />
|
||||
</module>
|
||||
</echoxml>
|
||||
<jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.lang.typesystem2.helper.jar" duplicate="preserve">
|
||||
<fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.helper" />
|
||||
<fileset dir="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper" includes="icons/**, resources/**" />
|
||||
<fileset dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
|
||||
<fileset dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.helper.jar1" />
|
||||
</jar>
|
||||
<copyModels todir="${build.tmp}/customProcessors/copyModels/typesystem2-solutions-jetbrains.mps.lang.typesystem2.helper-models1">
|
||||
<fileset dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
|
||||
</copyModels>
|
||||
<jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.lang.typesystem2.helper-src.jar" duplicate="preserve">
|
||||
<fileset dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/source_gen">
|
||||
<exclude name="**/trace.info" />
|
||||
<exclude name="**/exports" />
|
||||
<exclude name="**/checkpoints" />
|
||||
<exclude name="**/*.mps" />
|
||||
</fileset>
|
||||
<zipfileset file="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/jetbrains.mps.lang.typesystem2.helper.msd" prefix="module" />
|
||||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/typesystem2-solutions-jetbrains.mps.lang.typesystem2.helper-models1" prefix="module/models" />
|
||||
</jar>
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.jar1" />
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.jar1/META-INF" />
|
||||
<echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.jar1/META-INF/module.xml">
|
||||
|
|
@ -1271,6 +1187,7 @@
|
|||
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
|
||||
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
|
||||
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
|
||||
<module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
|
||||
<module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
|
||||
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
|
||||
<module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
|
||||
|
|
@ -1278,6 +1195,7 @@
|
|||
<module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
|
||||
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
|
||||
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
|
||||
<module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
|
||||
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
|
||||
</dependencies>
|
||||
<library jar="../lib/reactive-streams-1.0.0.final-0.7.jar" />
|
||||
|
|
@ -1452,7 +1370,7 @@
|
|||
<delete dir="${build.layout}" />
|
||||
</target>
|
||||
|
||||
<target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.lang.typechecking.test, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.typechecking.sample, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.typechecking.sample.test" />
|
||||
<target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.lang.typechecking.test, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.typechecking.sample, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.typechecking.sample.test" />
|
||||
|
||||
<target name="processResources" />
|
||||
|
||||
|
|
@ -1548,7 +1466,6 @@
|
|||
<library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
|
||||
<library file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
|
||||
<chunk>
|
||||
<module file="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/jetbrains.mps.lang.typesystem2.helper.msd" />
|
||||
<module file="${basedir}/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" />
|
||||
<module file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" />
|
||||
<module file="${basedir}/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" />
|
||||
|
|
@ -2059,45 +1976,6 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.lang.typesystem2.helper" depends="fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.helper" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.helper" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
<compilerarg value="-Xlint:none" />
|
||||
<src>
|
||||
<path location="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/source_gen" />
|
||||
</src>
|
||||
<classpath>
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jdom.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
|
||||
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
|
||||
</classpath>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.lang.smodel.types" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.smodel.types/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
|
||||
|
|
@ -2125,6 +2003,8 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
|
||||
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
|
||||
|
|
@ -2178,6 +2058,8 @@
|
|||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
|
||||
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
|
||||
|
|
@ -2203,7 +2085,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.lang.typechecking.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.ui, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.lang.typechecking.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.ui, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.test/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.test" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -2230,13 +2112,12 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.helper" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-test.jar" />
|
||||
|
|
@ -2283,7 +2164,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.typechecking" depends="java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.typechecking" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -2296,13 +2177,17 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
|
||||
|
|
@ -2310,11 +2195,6 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.helper" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
|
|
@ -2337,7 +2217,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.typechecking.ui" depends="java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.typechecking.ui" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -2350,13 +2230,17 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
|
||||
|
|
@ -2364,11 +2248,6 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.helper" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
|
|
@ -2603,10 +2482,10 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-test.jar" />
|
||||
<fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
|
||||
|
|
@ -2719,7 +2598,6 @@
|
|||
<pathelement location="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
|
||||
<pathelement location="${build.layout}/tests/jetbrains.mps.baseLanguageExt.jar" />
|
||||
<pathelement location="${build.layout}/tests/jetbrains.mps.lang.smodel.types.jar" />
|
||||
<pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.helper.jar" />
|
||||
<pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.runtime.jar" />
|
||||
<pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.template.jar" />
|
||||
<pathelement location="${build.layout}/tests/jetbrains.mps.logic.jar" />
|
||||
|
|
@ -2794,7 +2672,6 @@
|
|||
</target>
|
||||
|
||||
<target name="cleanSources">
|
||||
<delete dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/source_gen" />
|
||||
<delete dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/source_gen" />
|
||||
<delete dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/generator/source_gen" />
|
||||
<delete dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/source_gen" />
|
||||
|
|
|
|||
|
|
@ -895,44 +895,6 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1E1JtA" id="3u5wJtgk3a" role="2G$12L">
|
||||
<property role="BnDLt" value="true" />
|
||||
<property role="TrG5h" value="jetbrains.mps.lang.typesystem2.helper" />
|
||||
<property role="3LESm3" value="274c9cfa-1024-4444-904c-f2f1383a35da" />
|
||||
<property role="2GAjPV" value="false" />
|
||||
<node concept="55IIr" id="3u5wJtgk3b" role="3LF7KH">
|
||||
<node concept="2Ry0Ak" id="3u5wJtgk3c" role="iGT6I">
|
||||
<property role="2Ry0Am" value="typesystem2" />
|
||||
<node concept="2Ry0Ak" id="3u5wJtgk3d" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="solutions" />
|
||||
<node concept="2Ry0Ak" id="3u5wJtgk3e" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="jetbrains.mps.lang.typesystem2.helper" />
|
||||
<node concept="2Ry0Ak" id="3u5wJtgk96" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="jetbrains.mps.lang.typesystem2.helper.msd" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="3u5wJtgk3g" role="3bR37C">
|
||||
<node concept="3bR9La" id="3u5wJtgk3h" role="1SiIV1">
|
||||
<property role="3bR36h" value="true" />
|
||||
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="3u5wJtgk3m" role="3bR37C">
|
||||
<node concept="3bR9La" id="3u5wJtgk3n" role="1SiIV1">
|
||||
<property role="3bR36h" value="false" />
|
||||
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="3u5wJtgk3s" role="3bR37C">
|
||||
<node concept="3bR9La" id="3u5wJtgk3t" role="1SiIV1">
|
||||
<property role="3bR36h" value="false" />
|
||||
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1E1JtD" id="3u5wJtgiSM" role="2G$12L">
|
||||
<property role="BnDLt" value="true" />
|
||||
<property role="TrG5h" value="jetbrains.mps.lang.smodel.types" />
|
||||
|
|
@ -1009,12 +971,6 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="5pz4PwHqrJ8" role="3bR37C">
|
||||
<node concept="3bR9La" id="5pz4PwHqrJ9" role="1SiIV1">
|
||||
<property role="3bR36h" value="false" />
|
||||
<ref role="3bR37D" node="3u5wJtgk3a" resolve="jetbrains.mps.lang.typesystem2.helper" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="5pz4PwHqrJa" role="3bR37C">
|
||||
<node concept="3bR9La" id="5pz4PwHqrJb" role="1SiIV1">
|
||||
<property role="3bR36h" value="false" />
|
||||
|
|
@ -1140,12 +1096,6 @@
|
|||
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="3u5wJtgkeu" role="3bR37C">
|
||||
<node concept="3bR9La" id="3u5wJtgkev" role="1SiIV1">
|
||||
<property role="3bR36h" value="false" />
|
||||
<ref role="3bR37D" node="3u5wJtgk3a" resolve="jetbrains.mps.lang.typesystem2.helper" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="55Q$YFtvxay" role="3bR37C">
|
||||
<node concept="3bR9La" id="55Q$YFtvxaz" role="1SiIV1">
|
||||
<property role="3bR36h" value="true" />
|
||||
|
|
@ -1328,12 +1278,6 @@
|
|||
<ref role="3bR37D" to="ffeo:7Kfy9QB6Lfd" resolve="jetbrains.mps.findUsages.runtime" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="55Q$YFtvwRu" role="3bR37C">
|
||||
<node concept="3bR9La" id="55Q$YFtvwRv" role="1SiIV1">
|
||||
<property role="3bR36h" value="false" />
|
||||
<ref role="3bR37D" node="3u5wJtgk3a" resolve="jetbrains.mps.lang.typesystem2.helper" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="55Q$YFtvxjO" role="3bR37C">
|
||||
<node concept="3bR9La" id="55Q$YFtvxjP" role="1SiIV1">
|
||||
<property role="3bR36h" value="true" />
|
||||
|
|
@ -1597,9 +1541,6 @@
|
|||
<node concept="L2wRC" id="7Ant4WkHLms" role="39821P">
|
||||
<ref role="L2wRA" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.typesystem2.template" />
|
||||
</node>
|
||||
<node concept="L2wRC" id="3u5wJtgmSk" role="39821P">
|
||||
<ref role="L2wRA" node="3u5wJtgk3a" resolve="jetbrains.mps.lang.typesystem2.helper" />
|
||||
</node>
|
||||
<node concept="L2wRC" id="7Ant4WkHLmq" role="39821P">
|
||||
<ref role="L2wRA" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
|
||||
</node>
|
||||
|
|
@ -1829,9 +1770,6 @@
|
|||
<node concept="L2wRC" id="65DJywFk8vZ" role="39821P">
|
||||
<ref role="L2wRA" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.typesystem2.template" />
|
||||
</node>
|
||||
<node concept="L2wRC" id="3u5wJtgS6b" role="39821P">
|
||||
<ref role="L2wRA" node="3u5wJtgk3a" resolve="jetbrains.mps.lang.typesystem2.helper" />
|
||||
</node>
|
||||
<node concept="L2wRC" id="65DJywFj_1R" role="39821P">
|
||||
<ref role="L2wRA" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
|
||||
<node concept="3yLZsm" id="3NqN4u$_rT6" role="3yL2VB">
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
|
||||
<dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
|
||||
<dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
|
||||
<dependency reexport="false">274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)</dependency>
|
||||
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
|
||||
<dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
|
||||
<dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
|
||||
|
|
@ -57,7 +56,6 @@
|
|||
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
|
||||
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
|
||||
<module reference="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.lang.typechecking.test)" version="0" />
|
||||
<module reference="274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)" version="0" />
|
||||
<module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
|
||||
<module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
|
||||
<module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
<import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
|
||||
<import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.evaluation)" />
|
||||
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
|
||||
<import index="umch" ref="r:4caa22a9-5195-4617-8800-5f9f74cc4480(jetbrains.mps.lang.typesystem2.helper.plugin)" />
|
||||
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
|
||||
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
|
||||
<import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
|
||||
|
|
@ -41,6 +40,7 @@
|
|||
<import index="tlxd" ref="r:bc54949b-877a-412d-bb6d-5859d76db7ae(jetbrains.mps.lang.typechecking.test.data)" />
|
||||
<import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
|
||||
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
|
||||
<import index="qox2" ref="r:7ff0776c-aea4-4df2-88a3-2efb6b568dc3(jetbrains.mps.typechecking.plugin)" />
|
||||
</imports>
|
||||
<registry>
|
||||
<language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
|
||||
|
|
@ -320,11 +320,11 @@
|
|||
<node concept="3cpWsn" id="6QH_LDtdTgs" role="3cpWs9">
|
||||
<property role="TrG5h" value="tc" />
|
||||
<node concept="3uibUv" id="6QH_LDtdTgp" role="1tU5fm">
|
||||
<ref role="3uigEE" to="umch:4Z$O9mrQIzY" resolve="TypecheckingCache" />
|
||||
<ref role="3uigEE" to="qox2:4Z$O9mrQIzY" resolve="TypecheckingCache" />
|
||||
</node>
|
||||
<node concept="2YIFZM" id="443LGHBoCc7" role="33vP2m">
|
||||
<ref role="37wK5l" to="umch:4Z$O9mrQIG1" resolve="get" />
|
||||
<ref role="1Pybhc" to="umch:4Z$O9mrQIzY" resolve="TypecheckingCache" />
|
||||
<ref role="37wK5l" to="qox2:4Z$O9mrQIG1" resolve="get" />
|
||||
<ref role="1Pybhc" to="qox2:4Z$O9mrQIzY" resolve="TypecheckingCache" />
|
||||
<node concept="37vLTw" id="14$_tTxzVwH" role="37wK5m">
|
||||
<ref role="3cqZAo" node="14$_tTxzTDw" resolve="modelRepo" />
|
||||
</node>
|
||||
|
|
@ -335,14 +335,14 @@
|
|||
<node concept="3cpWsn" id="6QH_LDtdVHk" role="3cpWs9">
|
||||
<property role="TrG5h" value="typesCache" />
|
||||
<node concept="3uibUv" id="443LGHByist" role="1tU5fm">
|
||||
<ref role="3uigEE" to="umch:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
|
||||
<ref role="3uigEE" to="qox2:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
|
||||
</node>
|
||||
<node concept="2OqwBi" id="6QH_LDtdVHl" role="33vP2m">
|
||||
<node concept="37vLTw" id="6QH_LDtdVHm" role="2Oq$k0">
|
||||
<ref role="3cqZAo" node="6QH_LDtdTgs" resolve="tc" />
|
||||
</node>
|
||||
<node concept="liA8E" id="6QH_LDtdVHn" role="2OqNvi">
|
||||
<ref role="37wK5l" to="umch:4Z$O9mrQJgp" resolve="cachedTypes" />
|
||||
<ref role="37wK5l" to="qox2:4Z$O9mrQJgp" resolve="cachedTypes" />
|
||||
<node concept="2OqwBi" id="443LGHB5OH6" role="37wK5m">
|
||||
<node concept="2JrnkZ" id="443LGHB5Olz" role="2Oq$k0">
|
||||
<node concept="37vLTw" id="14$_tTxzVDX" role="2JrQYb">
|
||||
|
|
@ -369,14 +369,14 @@
|
|||
<node concept="3cpWsn" id="6QH_LDtdXLK" role="3cpWs9">
|
||||
<property role="TrG5h" value="typeCache2" />
|
||||
<node concept="3uibUv" id="443LGHBynwC" role="1tU5fm">
|
||||
<ref role="3uigEE" to="umch:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
|
||||
<ref role="3uigEE" to="qox2:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
|
||||
</node>
|
||||
<node concept="2OqwBi" id="6QH_LDtdXLL" role="33vP2m">
|
||||
<node concept="37vLTw" id="6QH_LDtdXLM" role="2Oq$k0">
|
||||
<ref role="3cqZAo" node="6QH_LDtdTgs" resolve="tc" />
|
||||
</node>
|
||||
<node concept="liA8E" id="6QH_LDtdXLN" role="2OqNvi">
|
||||
<ref role="37wK5l" to="umch:6QH_LDtbsGz" resolve="updateCachedTypes" />
|
||||
<ref role="37wK5l" to="qox2:6QH_LDtbsGz" resolve="updateCachedTypes" />
|
||||
<node concept="2OqwBi" id="443LGHB5G43" role="37wK5m">
|
||||
<node concept="2JrnkZ" id="443LGHB5FG9" role="2Oq$k0">
|
||||
<node concept="37vLTw" id="14$_tTxzVPf" role="2JrQYb">
|
||||
|
|
@ -408,12 +408,12 @@
|
|||
<node concept="3cpWsn" id="443LGHBd5ma" role="3cpWs9">
|
||||
<property role="TrG5h" value="typesModelOwner" />
|
||||
<node concept="3uibUv" id="443LGHBd5m3" role="1tU5fm">
|
||||
<ref role="3uigEE" to="umch:2zU3cYq$91A" resolve="TypesModelManager.ModelOwner" />
|
||||
<ref role="3uigEE" to="qox2:2zU3cYq$91A" resolve="TypesModelManager.ModelOwner" />
|
||||
</node>
|
||||
<node concept="2OqwBi" id="443LGHBd5mb" role="33vP2m">
|
||||
<node concept="2YIFZM" id="443LGHBd5mc" role="2Oq$k0">
|
||||
<ref role="37wK5l" to="umch:2zU3cYqxb_u" resolve="get" />
|
||||
<ref role="1Pybhc" to="umch:2zU3cYqxbbL" resolve="TypesModelManager" />
|
||||
<ref role="37wK5l" to="qox2:2zU3cYqxb_u" resolve="get" />
|
||||
<ref role="1Pybhc" to="qox2:2zU3cYqxbbL" resolve="TypesModelManager" />
|
||||
<node concept="2OqwBi" id="443LGHBd5md" role="37wK5m">
|
||||
<node concept="1jxXqW" id="443LGHBd5me" role="2Oq$k0" />
|
||||
<node concept="liA8E" id="443LGHBd5mf" role="2OqNvi">
|
||||
|
|
@ -422,7 +422,7 @@
|
|||
</node>
|
||||
</node>
|
||||
<node concept="liA8E" id="443LGHBd5mg" role="2OqNvi">
|
||||
<ref role="37wK5l" to="umch:2zU3cYq$52j" resolve="emptyModel" />
|
||||
<ref role="37wK5l" to="qox2:2zU3cYq$52j" resolve="emptyModel" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -436,7 +436,7 @@
|
|||
<ref role="3cqZAo" node="443LGHBd5ma" resolve="typesModelOwner" />
|
||||
</node>
|
||||
<node concept="liA8E" id="443LGHBd9Gw" role="2OqNvi">
|
||||
<ref role="37wK5l" to="umch:2zU3cYq$9HD" resolve="model" />
|
||||
<ref role="37wK5l" to="qox2:2zU3cYq$9HD" resolve="model" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -538,14 +538,14 @@
|
|||
<node concept="3cpWsn" id="6QH_LDtdZNu" role="3cpWs9">
|
||||
<property role="TrG5h" value="typesCache3" />
|
||||
<node concept="3uibUv" id="443LGHByr8Z" role="1tU5fm">
|
||||
<ref role="3uigEE" to="umch:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
|
||||
<ref role="3uigEE" to="qox2:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
|
||||
</node>
|
||||
<node concept="2OqwBi" id="6QH_LDtdZNv" role="33vP2m">
|
||||
<node concept="37vLTw" id="6QH_LDtdZNw" role="2Oq$k0">
|
||||
<ref role="3cqZAo" node="6QH_LDtdTgs" resolve="tc" />
|
||||
</node>
|
||||
<node concept="liA8E" id="6QH_LDtdZNx" role="2OqNvi">
|
||||
<ref role="37wK5l" to="umch:4Z$O9mrQJgp" resolve="cachedTypes" />
|
||||
<ref role="37wK5l" to="qox2:4Z$O9mrQJgp" resolve="cachedTypes" />
|
||||
<node concept="2OqwBi" id="443LGHB5Q2V" role="37wK5m">
|
||||
<node concept="2JrnkZ" id="443LGHB5Q2W" role="2Oq$k0">
|
||||
<node concept="37vLTw" id="443LGHB5Q2X" role="2JrQYb">
|
||||
|
|
@ -624,8 +624,8 @@
|
|||
<node concept="3clFbS" id="14$_tTx$j9N" role="2GVbov">
|
||||
<node concept="3clFbF" id="14$_tTxAMey" role="3cqZAp">
|
||||
<node concept="2YIFZM" id="443LGHBoCcb" role="3clFbG">
|
||||
<ref role="37wK5l" to="umch:14$_tTxAmT8" resolve="dispose" />
|
||||
<ref role="1Pybhc" to="umch:4Z$O9mrQIzY" resolve="TypecheckingCache" />
|
||||
<ref role="37wK5l" to="qox2:14$_tTxAmT8" resolve="dispose" />
|
||||
<ref role="1Pybhc" to="qox2:4Z$O9mrQIzY" resolve="TypecheckingCache" />
|
||||
<node concept="37vLTw" id="14$_tTxAP4p" role="37wK5m">
|
||||
<ref role="3cqZAo" node="14$_tTxzTDw" resolve="modelRepo" />
|
||||
</node>
|
||||
|
|
@ -633,8 +633,8 @@
|
|||
</node>
|
||||
<node concept="3clFbF" id="14$_tTx$kBI" role="3cqZAp">
|
||||
<node concept="2YIFZM" id="14$_tTx$kBJ" role="3clFbG">
|
||||
<ref role="1Pybhc" to="umch:2zU3cYqxbbL" resolve="TypesModelManager" />
|
||||
<ref role="37wK5l" to="umch:2zU3cYqyg2V" resolve="dispose" />
|
||||
<ref role="1Pybhc" to="qox2:2zU3cYqxbbL" resolve="TypesModelManager" />
|
||||
<ref role="37wK5l" to="qox2:2zU3cYqyg2V" resolve="dispose" />
|
||||
<node concept="37vLTw" id="14$_tTx$kBK" role="37wK5m">
|
||||
<ref role="3cqZAo" node="14$_tTxzTDw" resolve="modelRepo" />
|
||||
</node>
|
||||
|
|
@ -1124,8 +1124,8 @@
|
|||
<node concept="3clFbS" id="6$7vuu2xvux" role="2GVbov">
|
||||
<node concept="3clFbF" id="14$_tTxAR_w" role="3cqZAp">
|
||||
<node concept="2YIFZM" id="443LGHBoCca" role="3clFbG">
|
||||
<ref role="37wK5l" to="umch:14$_tTxAmT8" resolve="dispose" />
|
||||
<ref role="1Pybhc" to="umch:4Z$O9mrQIzY" resolve="TypecheckingCache" />
|
||||
<ref role="37wK5l" to="qox2:14$_tTxAmT8" resolve="dispose" />
|
||||
<ref role="1Pybhc" to="qox2:4Z$O9mrQIzY" resolve="TypecheckingCache" />
|
||||
<node concept="37vLTw" id="14$_tTxAR_y" role="37wK5m">
|
||||
<ref role="3cqZAo" node="14$_tTxzzxH" resolve="modelRepo" />
|
||||
</node>
|
||||
|
|
@ -1133,8 +1133,8 @@
|
|||
</node>
|
||||
<node concept="3clFbF" id="6$7vuu2xDxB" role="3cqZAp">
|
||||
<node concept="2YIFZM" id="6$7vuu2xD$t" role="3clFbG">
|
||||
<ref role="37wK5l" to="umch:2zU3cYqyg2V" resolve="dispose" />
|
||||
<ref role="1Pybhc" to="umch:2zU3cYqxbbL" resolve="TypesModelManager" />
|
||||
<ref role="37wK5l" to="qox2:2zU3cYqyg2V" resolve="dispose" />
|
||||
<ref role="1Pybhc" to="qox2:2zU3cYqxbbL" resolve="TypesModelManager" />
|
||||
<node concept="37vLTw" id="14$_tTxz_y9" role="37wK5m">
|
||||
<ref role="3cqZAo" node="14$_tTxzzxH" resolve="modelRepo" />
|
||||
</node>
|
||||
|
|
@ -1282,8 +1282,8 @@
|
|||
<node concept="3clFbS" id="3u5wJtbtkW" role="2GVbov">
|
||||
<node concept="3clFbF" id="14$_tTxAQ_B" role="3cqZAp">
|
||||
<node concept="2YIFZM" id="443LGHBoCc9" role="3clFbG">
|
||||
<ref role="37wK5l" to="umch:14$_tTxAmT8" resolve="dispose" />
|
||||
<ref role="1Pybhc" to="umch:4Z$O9mrQIzY" resolve="TypecheckingCache" />
|
||||
<ref role="37wK5l" to="qox2:14$_tTxAmT8" resolve="dispose" />
|
||||
<ref role="1Pybhc" to="qox2:4Z$O9mrQIzY" resolve="TypecheckingCache" />
|
||||
<node concept="37vLTw" id="14$_tTxAQ_D" role="37wK5m">
|
||||
<ref role="3cqZAo" node="14$_tTxz_CG" resolve="modelRepo" />
|
||||
</node>
|
||||
|
|
@ -1291,8 +1291,8 @@
|
|||
</node>
|
||||
<node concept="3clFbF" id="3u5wJtbv_Y" role="3cqZAp">
|
||||
<node concept="2YIFZM" id="3u5wJtbv_Z" role="3clFbG">
|
||||
<ref role="1Pybhc" to="umch:2zU3cYqxbbL" resolve="TypesModelManager" />
|
||||
<ref role="37wK5l" to="umch:2zU3cYqyg2V" resolve="dispose" />
|
||||
<ref role="1Pybhc" to="qox2:2zU3cYqxbbL" resolve="TypesModelManager" />
|
||||
<ref role="37wK5l" to="qox2:2zU3cYqyg2V" resolve="dispose" />
|
||||
<node concept="37vLTw" id="14$_tTxzB2G" role="37wK5m">
|
||||
<ref role="3cqZAo" node="14$_tTxz_CG" resolve="modelRepo" />
|
||||
</node>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
<dependency reexport="true">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
|
||||
<dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
|
||||
<dependency reexport="true">bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)</dependency>
|
||||
<dependency reexport="false">274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)</dependency>
|
||||
<dependency reexport="true">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
|
||||
</dependencies>
|
||||
<languageVersions>
|
||||
|
|
@ -49,7 +48,6 @@
|
|||
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
|
||||
<module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
|
||||
<module reference="5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)" version="0" />
|
||||
<module reference="274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)" version="0" />
|
||||
<module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
|
||||
<module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
|
||||
<module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
|
||||
|
|
|
|||
|
|
@ -81,7 +81,6 @@
|
|||
<import index="f4zo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.cells(MPS.Editor/)" />
|
||||
<import index="hhnx" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime(MPS.Editor/)" />
|
||||
<import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.evaluation)" />
|
||||
<import index="umch" ref="r:4caa22a9-5195-4617-8800-5f9f74cc4480(jetbrains.mps.lang.typesystem2.helper.plugin)" />
|
||||
<import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
|
||||
<import index="jkny" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.wm(MPS.IDEA/)" />
|
||||
<import index="m4y7" ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d/java:io.reactivex.schedulers(jetbrains.mps.typechecking/)" />
|
||||
|
|
@ -89,6 +88,7 @@
|
|||
<import index="f4yq" ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d/java:hu.akarnokd.rxjava2.swing(jetbrains.mps.typechecking/)" />
|
||||
<import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
|
||||
<import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.typechecking)" />
|
||||
<import index="qox2" ref="r:7ff0776c-aea4-4df2-88a3-2efb6b568dc3(jetbrains.mps.typechecking.plugin)" />
|
||||
<import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" implicit="true" />
|
||||
</imports>
|
||||
<registry>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
<sourcePath />
|
||||
<dependencies>
|
||||
<dependency reexport="true">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
|
||||
<dependency reexport="false">274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)</dependency>
|
||||
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
|
||||
<dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
|
||||
<dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
|
||||
|
|
@ -30,13 +29,17 @@
|
|||
</dependencies>
|
||||
<languageVersions>
|
||||
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
|
||||
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
|
||||
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
|
||||
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
|
||||
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
|
||||
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
|
||||
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
|
||||
<language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
|
||||
<language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
|
||||
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
|
||||
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="2" />
|
||||
<language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
|
||||
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
|
||||
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
|
||||
</languageVersions>
|
||||
|
|
@ -51,7 +54,6 @@
|
|||
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
|
||||
<module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
|
||||
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
|
||||
<module reference="274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)" version="0" />
|
||||
<module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
|
||||
<module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
|
||||
<module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<model ref="r:4caa22a9-5195-4617-8800-5f9f74cc4480(jetbrains.mps.lang.typesystem2.helper.plugin)">
|
||||
<model ref="r:7ff0776c-aea4-4df2-88a3-2efb6b568dc3(jetbrains.mps.typechecking.plugin)">
|
||||
<persistence version="9" />
|
||||
<languages>
|
||||
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
|
||||
|
|
@ -13,7 +13,6 @@
|
|||
</languages>
|
||||
<imports>
|
||||
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
|
||||
<import index="umch" ref="r:4caa22a9-5195-4617-8800-5f9f74cc4480(jetbrains.mps.lang.typesystem2.helper.plugin)" />
|
||||
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
|
||||
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
|
||||
<import index="cmfw" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.event(MPS.OpenAPI/)" />
|
||||
|
|
@ -46,6 +45,7 @@
|
|||
<import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
|
||||
<import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
|
||||
<import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
|
||||
<import index="qox2" ref="r:7ff0776c-aea4-4df2-88a3-2efb6b568dc3(jetbrains.mps.typechecking.plugin)" />
|
||||
</imports>
|
||||
<registry>
|
||||
<language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
|
||||
|
|
@ -623,11 +623,11 @@
|
|||
<node concept="3cpWsn" id="7kaxm0sECXE" role="3cpWs9">
|
||||
<property role="TrG5h" value="tc" />
|
||||
<node concept="3uibUv" id="7kaxm0sECXA" role="1tU5fm">
|
||||
<ref role="3uigEE" to="umch:4Z$O9mrQIzY" resolve="TypecheckingCache" />
|
||||
<ref role="3uigEE" to="qox2:4Z$O9mrQIzY" resolve="TypecheckingCache" />
|
||||
</node>
|
||||
<node concept="2YIFZM" id="443LGHBoCc8" role="33vP2m">
|
||||
<ref role="37wK5l" to="umch:4Z$O9mrQIG1" resolve="get" />
|
||||
<ref role="1Pybhc" to="umch:4Z$O9mrQIzY" resolve="TypecheckingCache" />
|
||||
<ref role="37wK5l" to="qox2:4Z$O9mrQIG1" resolve="get" />
|
||||
<ref role="1Pybhc" to="qox2:4Z$O9mrQIzY" resolve="TypecheckingCache" />
|
||||
<node concept="37vLTw" id="7kaxm0sECXG" role="37wK5m">
|
||||
<ref role="3cqZAo" node="6$7vuu2wPaF" resolve="repository" />
|
||||
</node>
|
||||
|
|
@ -638,14 +638,14 @@
|
|||
<node concept="3cpWsn" id="7kaxm0sEDgr" role="3cpWs9">
|
||||
<property role="TrG5h" value="typesCache" />
|
||||
<node concept="3uibUv" id="443LGHByOkC" role="1tU5fm">
|
||||
<ref role="3uigEE" to="umch:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
|
||||
<ref role="3uigEE" to="qox2:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
|
||||
</node>
|
||||
<node concept="2OqwBi" id="7kaxm0sEDgs" role="33vP2m">
|
||||
<node concept="37vLTw" id="7kaxm0sEDgt" role="2Oq$k0">
|
||||
<ref role="3cqZAo" node="7kaxm0sECXE" resolve="tc" />
|
||||
</node>
|
||||
<node concept="liA8E" id="7kaxm0sEDgu" role="2OqNvi">
|
||||
<ref role="37wK5l" to="umch:4Z$O9mrQJgp" resolve="cachedTypes" />
|
||||
<ref role="37wK5l" to="qox2:4Z$O9mrQJgp" resolve="cachedTypes" />
|
||||
<node concept="2OqwBi" id="443LGHB6JxP" role="37wK5m">
|
||||
<node concept="2JrnkZ" id="443LGHB6Irq" role="2Oq$k0">
|
||||
<node concept="37vLTw" id="7kaxm0sEDgv" role="2JrQYb">
|
||||
|
|
@ -672,7 +672,7 @@
|
|||
<ref role="3cqZAo" node="7kaxm0sECXE" resolve="tc" />
|
||||
</node>
|
||||
<node concept="liA8E" id="6QH_LDtbKr5" role="2OqNvi">
|
||||
<ref role="37wK5l" to="umch:6QH_LDtbsGz" resolve="updateCachedTypes" />
|
||||
<ref role="37wK5l" to="qox2:6QH_LDtbsGz" resolve="updateCachedTypes" />
|
||||
<node concept="2OqwBi" id="443LGHB5CaU" role="37wK5m">
|
||||
<node concept="2JrnkZ" id="443LGHB5B45" role="2Oq$k0">
|
||||
<node concept="37vLTw" id="6QH_LDtbKtg" role="2JrQYb">
|
||||
|
|
@ -943,18 +943,18 @@
|
|||
<node concept="3cpWsn" id="443LGHBd5ma" role="3cpWs9">
|
||||
<property role="TrG5h" value="typesModelOwner" />
|
||||
<node concept="3uibUv" id="443LGHBd5m3" role="1tU5fm">
|
||||
<ref role="3uigEE" to="umch:2zU3cYq$91A" resolve="TypesModelManager.ModelOwner" />
|
||||
<ref role="3uigEE" to="qox2:2zU3cYq$91A" resolve="TypesModelManager.ModelOwner" />
|
||||
</node>
|
||||
<node concept="2OqwBi" id="443LGHBd5mb" role="33vP2m">
|
||||
<node concept="2YIFZM" id="443LGHBd5mc" role="2Oq$k0">
|
||||
<ref role="37wK5l" to="umch:2zU3cYqxb_u" resolve="get" />
|
||||
<ref role="1Pybhc" to="umch:2zU3cYqxbbL" resolve="TypesModelManager" />
|
||||
<ref role="37wK5l" to="qox2:2zU3cYqxb_u" resolve="get" />
|
||||
<ref role="1Pybhc" to="qox2:2zU3cYqxbbL" resolve="TypesModelManager" />
|
||||
<node concept="37vLTw" id="443LGHBdctZ" role="37wK5m">
|
||||
<ref role="3cqZAo" node="6$7vuu2wPaF" resolve="repository" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="liA8E" id="443LGHBd5mg" role="2OqNvi">
|
||||
<ref role="37wK5l" to="umch:2zU3cYq$52j" resolve="emptyModel" />
|
||||
<ref role="37wK5l" to="qox2:2zU3cYq$52j" resolve="emptyModel" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -968,7 +968,7 @@
|
|||
<ref role="3cqZAo" node="443LGHBd5ma" resolve="typesModelOwner" />
|
||||
</node>
|
||||
<node concept="liA8E" id="443LGHBdhzZ" role="2OqNvi">
|
||||
<ref role="37wK5l" to="umch:2zU3cYq$9HD" resolve="model" />
|
||||
<ref role="37wK5l" to="qox2:2zU3cYq$9HD" resolve="model" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -7764,8 +7764,8 @@
|
|||
<node concept="37vLTI" id="443LGHBcHIm" role="3clFbG">
|
||||
<node concept="2OqwBi" id="443LGHBcO$x" role="37vLTx">
|
||||
<node concept="2YIFZM" id="443LGHBcO$y" role="2Oq$k0">
|
||||
<ref role="37wK5l" to="umch:2zU3cYqxb_u" resolve="get" />
|
||||
<ref role="1Pybhc" to="umch:2zU3cYqxbbL" resolve="TypesModelManager" />
|
||||
<ref role="37wK5l" to="qox2:2zU3cYqxb_u" resolve="get" />
|
||||
<ref role="1Pybhc" to="qox2:2zU3cYqxbbL" resolve="TypesModelManager" />
|
||||
<node concept="2OqwBi" id="443LGHBcO$z" role="37wK5m">
|
||||
<node concept="37vLTw" id="443LGHBcO$$" role="2Oq$k0">
|
||||
<ref role="3cqZAo" node="6IQb_RxlCww" resolve="mpsProject" />
|
||||
|
|
@ -7776,7 +7776,7 @@
|
|||
</node>
|
||||
</node>
|
||||
<node concept="liA8E" id="443LGHBcO$A" role="2OqNvi">
|
||||
<ref role="37wK5l" to="umch:2zU3cYq$52j" resolve="emptyModel" />
|
||||
<ref role="37wK5l" to="qox2:2zU3cYq$52j" resolve="emptyModel" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="2OqwBi" id="443LGHBcD5o" role="37vLTJ">
|
||||
|
|
@ -7796,7 +7796,7 @@
|
|||
<ref role="3cqZAo" node="443LGHBc_9c" resolve="typesModelOwner" />
|
||||
</node>
|
||||
<node concept="liA8E" id="Hg6EncbtTq" role="2OqNvi">
|
||||
<ref role="37wK5l" to="umch:2zU3cYq$9HD" resolve="model" />
|
||||
<ref role="37wK5l" to="qox2:2zU3cYq$9HD" resolve="model" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -7971,7 +7971,7 @@
|
|||
<ref role="3cqZAo" node="443LGHBc_9c" resolve="typesModelOwner" />
|
||||
</node>
|
||||
<node concept="liA8E" id="Hg6EncbtUC" role="2OqNvi">
|
||||
<ref role="37wK5l" to="umch:2zU3cYq$pNG" resolve="register" />
|
||||
<ref role="37wK5l" to="qox2:2zU3cYq$pNG" resolve="register" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -8105,7 +8105,7 @@
|
|||
<property role="TrG5h" value="typesModelOwner" />
|
||||
<node concept="3Tm6S6" id="443LGHBc_9d" role="1B3o_S" />
|
||||
<node concept="3uibUv" id="443LGHBcAnA" role="1tU5fm">
|
||||
<ref role="3uigEE" to="umch:2zU3cYq$91A" resolve="TypesModelManager.ModelOwner" />
|
||||
<ref role="3uigEE" to="qox2:2zU3cYq$91A" resolve="TypesModelManager.ModelOwner" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3Tm1VV" id="6IQb_RxlB9w" role="1B3o_S" />
|
||||
|
|
@ -8191,7 +8191,7 @@
|
|||
<node concept="37vLTG" id="443LGHBcWVk" role="3clF46">
|
||||
<property role="TrG5h" value="modelOwner" />
|
||||
<node concept="3uibUv" id="443LGHBcXDO" role="1tU5fm">
|
||||
<ref role="3uigEE" to="umch:2zU3cYq$91A" resolve="TypesModelManager.ModelOwner" />
|
||||
<ref role="3uigEE" to="qox2:2zU3cYq$91A" resolve="TypesModelManager.ModelOwner" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3cqZAl" id="443LGHBcVeV" role="3clF45" />
|
||||
|
|
@ -8237,7 +8237,7 @@
|
|||
<ref role="3cqZAo" node="6QH_LDtcxh0" resolve="typesModelOwner" />
|
||||
</node>
|
||||
<node concept="liA8E" id="6QH_LDtcxgL" role="2OqNvi">
|
||||
<ref role="37wK5l" to="umch:2zU3cYq$$V4" resolve="clear" />
|
||||
<ref role="37wK5l" to="qox2:2zU3cYq$$V4" resolve="clear" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -8327,7 +8327,7 @@
|
|||
<property role="TrG5h" value="typesModelOwner" />
|
||||
<node concept="3Tm6S6" id="6QH_LDtcxh1" role="1B3o_S" />
|
||||
<node concept="3uibUv" id="6QH_LDtcxh2" role="1tU5fm">
|
||||
<ref role="3uigEE" to="umch:2zU3cYq$91A" resolve="TypesModelManager.ModelOwner" />
|
||||
<ref role="3uigEE" to="qox2:2zU3cYq$91A" resolve="TypesModelManager.ModelOwner" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="312cEg" id="6QH_LDtcJq4" role="jymVt">
|
||||
|
|
@ -8373,7 +8373,7 @@
|
|||
<node concept="2tJIrI" id="6QH_LDtffK6" role="jymVt" />
|
||||
<node concept="3Tm1VV" id="6QH_LDtfe1a" role="1B3o_S" />
|
||||
<node concept="3uibUv" id="443LGHBy9d5" role="3HQHJm">
|
||||
<ref role="3uigEE" to="umch:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
|
||||
<ref role="3uigEE" to="qox2:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
|
||||
</node>
|
||||
</node>
|
||||
</model>
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<solution name="jetbrains.mps.lang.typesystem2.helper" uuid="274c9cfa-1024-4444-904c-f2f1383a35da" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
|
||||
<models>
|
||||
<modelRoot contentPath="${module}" type="default">
|
||||
<sourceRoot location="models" />
|
||||
</modelRoot>
|
||||
</models>
|
||||
<sourcePath />
|
||||
<dependencies>
|
||||
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
|
||||
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
|
||||
<dependency reexport="true">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
|
||||
</dependencies>
|
||||
<languageVersions>
|
||||
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
|
||||
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
|
||||
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
|
||||
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
|
||||
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
|
||||
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
|
||||
<language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
|
||||
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
|
||||
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="2" />
|
||||
<language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
|
||||
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
|
||||
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
|
||||
</languageVersions>
|
||||
<dependencyVersions>
|
||||
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
|
||||
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
|
||||
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
|
||||
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
|
||||
<module reference="274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)" version="0" />
|
||||
</dependencyVersions>
|
||||
</solution>
|
||||
|
||||
Loading…
Reference in New Issue