[ml-local-models] change modules dependencies structure

GitOrigin-RevId: 906186f2d5ff4982f0eaa263ae9d34c54df12093
This commit is contained in:
Alexey Kalina
2021-02-10 17:43:30 +00:00
committed by intellij-monorepo-bot
parent 08debd44b6
commit bac3c226c6
18 changed files with 43 additions and 20 deletions
+2 -1
View File
@@ -576,6 +576,7 @@
<module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/intellij.java.langInjection.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/intellij.java.langInjection.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/intellilang-jps-plugin/intellij.java.langInjection.jps.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/intellilang-jps-plugin/intellij.java.langInjection.jps.iml" />
<module fileurl="file://$PROJECT_DIR$/java/manifest/intellij.java.manifest.iml" filepath="$PROJECT_DIR$/java/manifest/intellij.java.manifest.iml" />
<module fileurl="file://$PROJECT_DIR$/java/java-ml-local-models/intellij.java.ml.models.local.iml" filepath="$PROJECT_DIR$/java/java-ml-local-models/intellij.java.ml.models.local.iml" />
<module fileurl="file://$PROJECT_DIR$/java/plugin/intellij.java.plugin.iml" filepath="$PROJECT_DIR$/java/plugin/intellij.java.plugin.iml" />
<module fileurl="file://$PROJECT_DIR$/java/java-psi-api/intellij.java.psi.iml" filepath="$PROJECT_DIR$/java/java-psi-api/intellij.java.psi.iml" />
<module fileurl="file://$PROJECT_DIR$/java/java-psi-impl/intellij.java.psi.impl.iml" filepath="$PROJECT_DIR$/java/java-psi-impl/intellij.java.psi.impl.iml" />
@@ -635,7 +636,7 @@
<module fileurl="file://$PROJECT_DIR$/plugins/maven/maven3-server-impl/intellij.maven.server.m3.impl.iml" filepath="$PROJECT_DIR$/plugins/maven/maven3-server-impl/intellij.maven.server.m3.impl.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/maven/maven30-server-impl/intellij.maven.server.m30.impl.iml" filepath="$PROJECT_DIR$/plugins/maven/maven30-server-impl/intellij.maven.server.m30.impl.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/maven/maven36-server-impl/intellij.maven.server.m36.impl.iml" filepath="$PROJECT_DIR$/plugins/maven/maven36-server-impl/intellij.maven.server.m36.impl.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/ml-local-models/intellij.mlLocalModels.iml" filepath="$PROJECT_DIR$/plugins/ml-local-models/intellij.mlLocalModels.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/ml-local-models/intellij.ml.models.local.iml" filepath="$PROJECT_DIR$/plugins/ml-local-models/intellij.ml.models.local.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/built-in-server/client/node-rpc-client/intellij.nodeRpcClient.iml" filepath="$PROJECT_DIR$/platform/built-in-server/client/node-rpc-client/intellij.nodeRpcClient.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/package-search/intellij.packageSearch.iml" filepath="$PROJECT_DIR$/plugins/package-search/intellij.packageSearch.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/package-search/pkgs-tests/intellij.packageSearch.tests.iml" filepath="$PROJECT_DIR$/plugins/package-search/pkgs-tests/intellij.packageSearch.tests.iml" />
@@ -76,6 +76,7 @@ abstract class BaseIdeaProperties extends JetBrainsProductProperties {
"intellij.completionMlRanking",
"intellij.completionMlRankingModels",
"intellij.statsCollector",
"intellij.ml.models.local",
"intellij.sh",
"intellij.vcs.changeReminder",
"intellij.filePrediction",
+1 -1
View File
@@ -153,6 +153,6 @@
<orderEntry type="module" module-name="intellij.java.featuresTrainer" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.idea.community.build.tasks" scope="TEST" />
<orderEntry type="module" module-name="intellij.junit.v5.rt.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.mlLocalModels" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.java.ml.models.local" scope="RUNTIME" />
</component>
</module>
-1
View File
@@ -84,7 +84,6 @@
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
<orderEntry type="module" module-name="intellij.mlLocalModels" scope="PROVIDED" />
</component>
<component name="copyright">
<Base>
@@ -17,7 +17,6 @@
<module value="com.intellij.modules.java"/>
<depends optional="true" config-file="images-integration.xml">com.intellij.platform.images</depends>
<depends optional="true" config-file="java-ml-local-models.xml">com.intellij.ml.local.models</depends>
<xi:include href="/idea/JavaActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<idea-plugin>
<extensions defaultExtensionNs="com.intellij">
<ml.local.models.factory language="JAVA" implementationClass="com.intellij.codeInsight.completion.ml.local.JavaMethodsFrequencyModelFactory"/>
<ml.local.models.factory language="JAVA" implementationClass="com.intellij.codeInsight.completion.ml.local.JavaClassesFrequencyModelFactory"/>
<completion.ml.contextFeatures language="JAVA" implementationClass="com.intellij.codeInsight.completion.ml.local.JavaFrequencyContextFeatureProvider"/>
<completion.ml.elementFeatures language="JAVA" implementationClass="com.intellij.codeInsight.completion.ml.local.JavaFrequencyElementFeatureProvider"/>
</extensions>
</idea-plugin>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/../java-ml-local-models">
<sourceFolder url="file://$MODULE_DIR$/../java-ml-local-models/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../java-ml-local-models/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/../java-ml-local-models/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="module" module-name="intellij.java.impl" />
<orderEntry type="module" module-name="intellij.ml.models.local" />
</component>
</module>
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<idea-plugin>
<extensions defaultExtensionNs="com.intellij">
<ml.local.models.factory language="JAVA" implementationClass="com.intellij.java.ml.local.JavaMethodsFrequencyModelFactory"/>
<ml.local.models.factory language="JAVA" implementationClass="com.intellij.java.ml.local.JavaClassesFrequencyModelFactory"/>
<completion.ml.contextFeatures language="JAVA" implementationClass="com.intellij.java.ml.local.JavaFrequencyContextFeatureProvider"/>
<completion.ml.elementFeatures language="JAVA" implementationClass="com.intellij.java.ml.local.JavaFrequencyElementFeatureProvider"/>
</extensions>
<depends>com.intellij.ml.local.models</depends>
</idea-plugin>
@@ -1,5 +1,5 @@
// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.codeInsight.completion.ml.local
package com.intellij.java.ml.local
import com.intellij.ml.local.models.frequency.classes.ClassesFrequencyModelFactory
import com.intellij.ml.local.models.frequency.classes.ClassesUsagesTracker
@@ -1,5 +1,5 @@
// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.codeInsight.completion.ml.local
package com.intellij.java.ml.local
import com.intellij.codeInsight.completion.CompletionParameters
import com.intellij.codeInsight.completion.ml.CompletionEnvironment
@@ -1,5 +1,5 @@
// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.codeInsight.completion.ml.local
package com.intellij.java.ml.local
import com.intellij.codeInsight.completion.CompletionLocation
import com.intellij.codeInsight.completion.ml.ContextFeatures
@@ -1,5 +1,5 @@
// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.codeInsight.completion.ml.local
package com.intellij.java.ml.local
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiMethod
@@ -1,5 +1,5 @@
// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.codeInsight.completion.ml.local
package com.intellij.java.ml.local
import com.intellij.ml.local.models.frequency.methods.MethodsFrequencyModelFactory
import com.intellij.ml.local.models.frequency.methods.MethodsUsagesTracker
@@ -30,6 +30,7 @@
<depends optional="true" config-file="structuralsearch-java.xml">com.intellij.modules.structuralsearch</depends>
<depends optional="true" config-file="RemoteServersJava.xml">com.intellij.modules.remoteServers</depends>
<depends optional="true" config-file="java-features-trainer.xml">training</depends>
<depends optional="true" config-file="java-ml-local-models.xml">com.intellij.ml.local.models</depends>
<extensions defaultExtensionNs="com.intellij">
<moduleType id="JAVA_MODULE" classpathProvider="true" implementationClass="com.intellij.openapi.module.JavaModuleType"/>
@@ -263,6 +263,9 @@ final class CommunityRepositoryModules {
plugin("intellij.statsCollector") {
bundlingRestrictions.includeInEapOnly = true
},
plugin("intellij.ml.models.local") {
bundlingRestrictions.includeInEapOnly = true
},
plugin("intellij.jps.cache"),
plugin("intellij.space") {
withProjectLibrary("space-idea-sdk")
@@ -67,6 +67,7 @@ class JavaPluginLayout {
"intellij.java.structuralSearch",
"intellij.java.typeMigration",
"intellij.java.featuresTrainer",
"intellij.java.ml.models.local"
].each {
withModule(it, "java-impl.jar", "java_resources_en.jar")
}
@@ -5,7 +5,8 @@
<category>Other Tools</category>
<description><![CDATA[
<p>The plugin contains logic for training local models based on machine learning.</p>
<p>The plugin contains logic for training local models based on machine learning.
It allows to improve different IDE features by learning patterns from opened project.</p>
]]></description>
<actions>