Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check plugin dependencies on generation #31

Closed
wants to merge 1 commit into from
Closed

Check plugin dependencies on generation #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...s-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generated
View file
Open in desktop
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<dependencies version="2" modelHash="-41fgsw26oc0muyjt7jknrk9j9x4sdvw" />
<dependencies version="2" modelHash="-brtl0bvz1xefkkmjf4k0jbopl2wslsm" />

2 changes: 1 addition & 1 deletion ...mps/generator/source_gen.caches/jetbrains/mps/build/mps/generator/template/main/generated
View file
Open in desktop
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<dependencies version="2" modelHash="-4hpk6e8ydgwwv2coxrf746o6lb9pemv" />
<dependencies version="2" modelHash="-b8dvt404faibck4414afzdolhz0cuvd" />

3 changes: 2 additions & 1 deletion ...enerator/source_gen/jetbrains/mps/build/mps/generator/template/main/QueriesGenerated.java
View file
Open in desktop
Expand Up @@ -1395,9 +1395,10 @@ public void handle(IMessage msg) {
}
});
ml.checkAllModules(ModuleChecker.CheckType.LOAD_ALL);
ml.checkAllPlugins();

// move generators outside language, respect languages under Group project parts (hence, descendants), and
// do not touch Generators that are not child of a generator (i.e. standalone generator modules, once we have them)
// do not touch Generators that are not child of a language (i.e. standalone generator modules, once we have them)

for (SNode generator : SLinkOperations.collect(ListSequence.fromList(SLinkOperations.getChildren(project, MetaAdapterFactory.getContainmentLink(0x798100da4f0a421aL, 0xb99171f8c50ce5d2L, 0x4df58c6f18f84a13L, 0x668c6cfbafacf6f2L, "parts"))).translate(new ITranslator2<SNode, SNode>() {
public Iterable<SNode> translate(SNode it) {
Expand Down
2,601 changes: 1,301 additions & 1,300 deletions ...build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/trace.info
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 11 additions & 1 deletion ...uild.mps/generator/template/jetbrains/mps/build/mps/generator/template/main@generator.mps
View file
Open in desktop
Expand Up @@ -3564,6 +3564,16 @@
</node>
</node>
</node>
<node concept="3clFbF" id="6qqPOyjpOWk" role="3cqZAp">
<node concept="2OqwBi" id="6qqPOyjpP7C" role="3clFbG">
<node concept="37vLTw" id="6qqPOyjpOWi" role="2Oq$k0">
<ref role="3cqZAo" node="6cqWk79_Xjh" resolve="ml" />
</node>
<node concept="liA8E" id="6qqPOyjpPiP" role="2OqNvi">
<ref role="37wK5l" to="tken:6qqPOyjo3dt" resolve="checkAllPlugins" />
</node>
</node>
</node>
<node concept="3clFbH" id="7YI57w6S3Uh" role="3cqZAp" />
<node concept="3SKdUt" id="7YI57w6S5tu" role="3cqZAp">
<node concept="3SKdUq" id="7YI57w6S5vE" role="3SKWNk">
Expand All @@ -3572,7 +3582,7 @@
</node>
<node concept="3SKdUt" id="6cqWk79ARJi" role="3cqZAp">
<node concept="3SKdUq" id="6cqWk79ARJj" role="3SKWNk">
<property role="3SKdUp" value="do not touch Generators that are not child of a generator (i.e. standalone generator modules, once we have them)" />
<property role="3SKdUp" value="do not touch Generators that are not child of a language (i.e. standalone generator modules, once we have them)" />
</node>
</node>
<node concept="3clFbH" id="6cqWk79AG3V" role="3cqZAp" />
Expand Down
718 changes: 21 additions & 697 deletions plugins/mps-build/languages/build.mps/languageModels/typesystem.mps
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion plugins/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/generated
View file
Open in desktop
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<dependencies version="2" modelHash="-bcip7qz08qgmmw5vtjm8wow1q0a5l5w" />
<dependencies version="2" modelHash="eqnry76pj1gw19bplctw0r89up6u3km" />

24 changes: 2 additions & 22 deletions ...ild/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/typesystem/dependencies
View file
Open in desktop
@@ -1,23 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<dependenciesRoot>
<dependency className="jetbrains.mps.build.mps.typesystem.IdeaPluginDependenciesHelper" file="IdeaPluginDependenciesHelper.java">
<classNode dependClassName="java.lang.Iterable" />
<classNode dependClassName="java.lang.StringBuilder" />
<classNode dependClassName="java.util.Collections" />
<classNode dependClassName="java.util.HashSet" />
<classNode dependClassName="java.util.Set" />
<classNode dependClassName="jetbrains.mps.build.mps.util.MPSModulesClosure" />
<classNode dependClassName="jetbrains.mps.internal.collections.runtime.ISelector" />
<classNode dependClassName="jetbrains.mps.internal.collections.runtime.ITranslator2" />
<classNode dependClassName="jetbrains.mps.internal.collections.runtime.IWhereFilter" />
<classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
<classNode dependClassName="jetbrains.mps.internal.collections.runtime.Sequence" />
<classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
<classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
<classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations" />
<classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
<classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
</dependency>
<dependency className="jetbrains.mps.build.mps.typesystem.ReloadRequired_QuickFix" file="ReloadRequired_QuickFix.java">
<classNode dependClassName="java.lang.String" />
<classNode dependClassName="jetbrains.mps.build.mps.util.ModuleChecker" />
Expand Down Expand Up @@ -105,15 +87,13 @@
</dependency>
<dependency className="jetbrains.mps.build.mps.typesystem.check_IdeaPlugin_Dependencies_NonTypesystemRule" file="check_IdeaPlugin_Dependencies_NonTypesystemRule.java">
<classNode dependClassName="java.lang.StringBuilder" />
<classNode dependClassName="jetbrains.mps.build.mps.typesystem.IdeaPluginDependenciesHelper" />
<classNode dependClassName="jetbrains.mps.build.mps.util.IdeaPluginDependenciesHelper" />
<classNode dependClassName="jetbrains.mps.errors.IErrorReporter" />
<classNode dependClassName="jetbrains.mps.errors.messageTargets.MessageTarget" />
<classNode dependClassName="jetbrains.mps.errors.messageTargets.NodeMessageTarget" />
<classNode dependClassName="jetbrains.mps.errors.messageTargets.ReferenceMessageTarget" />
<classNode dependClassName="jetbrains.mps.extapi.module.TransientSModule" />
<classNode dependClassName="jetbrains.mps.internal.collections.runtime.ISelector" />
<classNode dependClassName="jetbrains.mps.internal.collections.runtime.IWhereFilter" />
<classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
<classNode dependClassName="jetbrains.mps.internal.collections.runtime.Sequence" />
<classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
<classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
<classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
Expand Down
2 changes: 1 addition & 1 deletion ...-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/typesystem/generated
View file
Open in desktop
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<dependencies version="2" modelHash="49udm8elgdccw3vd2mh9nbv3nb4n938" />
<dependencies version="2" modelHash="-6y8nft8rcqbuoy776z9y3pbtvs6sks2" />

21 changes: 21 additions & 0 deletions ...mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/util/dependencies
View file
Open in desktop
Expand Up @@ -24,6 +24,26 @@
<classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
<classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
</dependency>
<dependency className="jetbrains.mps.build.mps.util.IdeaPluginDependenciesHelper" file="IdeaPluginDependenciesHelper.java">
<classNode dependClassName="java.lang.Iterable" />
<classNode dependClassName="java.lang.String" />
<classNode dependClassName="java.lang.StringBuilder" />
<classNode dependClassName="java.util.Collections" />
<classNode dependClassName="java.util.HashSet" />
<classNode dependClassName="java.util.Set" />
<classNode dependClassName="jetbrains.mps.build.mps.util.MPSModulesClosure" />
<classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
<classNode dependClassName="jetbrains.mps.internal.collections.runtime.Sequence" />
<classNode dependClassName="jetbrains.mps.internal.collections.runtime.SetSequence" />
<classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
<classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
<classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations" />
<classNode dependClassName="jetbrains.mps.messages.IMessageHandler" />
<classNode dependClassName="jetbrains.mps.messages.Message" />
<classNode dependClassName="jetbrains.mps.messages.MessageKind" />
<classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
<classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
</dependency>
<dependency className="jetbrains.mps.build.mps.util.MPSModulesClosure" file="MPSModulesClosure.java">
<classNode dependClassName="java.lang.IllegalArgumentException" />
<classNode dependClassName="java.lang.IllegalStateException" />
Expand Down Expand Up @@ -181,6 +201,7 @@
<classNode dependClassName="java.lang.Iterable" />
<classNode dependClassName="java.lang.String" />
<classNode dependClassName="jetbrains.mps.build.behavior.BuildSourcePath__BehaviorDescriptor" />
<classNode dependClassName="jetbrains.mps.build.mps.util.IdeaPluginDependenciesHelper" />
<classNode dependClassName="jetbrains.mps.build.mps.util.ModuleChecker" />
<classNode dependClassName="jetbrains.mps.build.mps.util.ModuleLoaderUtils" />
<classNode dependClassName="jetbrains.mps.build.mps.util.PathConverter" />
Expand Down
2 changes: 1 addition & 1 deletion ...ns/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/util/generated
View file
Open in desktop
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<dependencies version="2" modelHash="-5dsz1ctieabw039i3rzpe9ee3swiqil" />
<dependencies version="2" modelHash="-bdr7kgtpyqm1m9yw8cl2w7bnm9tjtix" />

83 changes: 0 additions & 83 deletions ...build.mps/source_gen/jetbrains/mps/build/mps/typesystem/IdeaPluginDependenciesHelper.java
View file
Open in desktop

This file was deleted.