Skip to content

Commit 658adb7

Browse files
vepanimasintellij-monorepo-bot
vepanimas
authored and
intellij-monorepo-bot
committed
[graphql] WEB-64772 migrate to a new plugin model
GitOrigin-RevId: 1d6545a7e095d3b7c999f683a6fa564c83e455b6
1 parent d177d48 commit 658adb7

File tree

704 files changed

+250
-118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

704 files changed

+250
-118
lines changed

‎intellij.graphql.iml

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
<component name="NewModuleRootManager" inherit-compiler-output="true">
44
<exclude-output />
55
<content url="file://$MODULE_DIR$">
6-
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
76
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
87
<sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" />
9-
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
10-
<sourceFolder url="file://$MODULE_DIR$/test-resources" type="java-test-resource" />
8+
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
119
<excludeFolder url="file://$MODULE_DIR$/build" />
1210
</content>
1311
<orderEntry type="inheritedJdk" />
@@ -20,33 +18,22 @@
2018
<orderEntry type="module" module-name="intellij.platform.usageView" />
2119
<orderEntry type="module" module-name="intellij.platform.usageView.impl" />
2220
<orderEntry type="module" module-name="intellij.xml.parser" />
23-
<orderEntry type="module" module-name="intellij.javascript.parser" />
24-
<orderEntry type="module" module-name="intellij.javascript.frontback.impl" />
2521
<orderEntry type="module" module-name="intellij.platform.lang" />
2622
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
2723
<orderEntry type="module" module-name="intellij.platform.core.impl" />
2824
<orderEntry type="module" module-name="intellij.platform.core" />
29-
<orderEntry type="module" module-name="intellij.yaml" />
3025
<orderEntry type="module" module-name="intellij.platform.core.ui" />
3126
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
3227
<orderEntry type="module" module-name="intellij.platform.analysis.impl" />
3328
<orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
3429
<orderEntry type="module" module-name="intellij.xml.impl" />
35-
<orderEntry type="module" module-name="intellij.javascript" />
36-
<orderEntry type="module" module-name="intellij.javascript.impl" />
3730
<orderEntry type="module" module-name="intellij.platform.projectModel" />
3831
<orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
39-
<orderEntry type="module" module-name="intellij.yaml.backend" />
40-
<orderEntry type="module" module-name="intellij.platform.langInjection" />
4132
<orderEntry type="module" module-name="intellij.platform.vcs.impl" />
4233
<orderEntry type="module" module-name="intellij.spellchecker" />
4334
<orderEntry type="module" module-name="intellij.platform.webide.impl" />
4435
<orderEntry type="module" module-name="intellij.platform.backend.workspace" />
45-
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
46-
<orderEntry type="module" module-name="intellij.javascript.testFramework" scope="TEST" />
47-
<orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
48-
<orderEntry type="module" module-name="intellij.idea.ultimate.customization" scope="TEST" />
49-
<orderEntry type="module" module-name="intellij.vuejs" scope="TEST" />
36+
<orderEntry type="module" module-name="intellij.json.backend" />
5037
<orderEntry type="library" name="swingx" level="project" />
5138
<orderEntry type="library" name="gson" level="project" />
5239
<orderEntry type="library" name="commons-io" level="project" />

‎gen/com/intellij/lang/jsgraphql/javascript/workspace/impl/GraphQLNodeModulesEntityImpl.kt renamed to ‎javascript/gen/com/intellij/graphql/javascript/workspace/impl/GraphQLNodeModulesEntityImpl.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.intellij.lang.jsgraphql.javascript.workspace.impl
1+
package com.intellij.graphql.javascript.workspace.impl
22

3-
import com.intellij.lang.jsgraphql.javascript.workspace.GraphQLNodeModulesEntity
3+
import com.intellij.graphql.javascript.workspace.GraphQLNodeModulesEntity
44
import com.intellij.platform.workspace.storage.ConnectionId
55
import com.intellij.platform.workspace.storage.EntitySource
66
import com.intellij.platform.workspace.storage.EntityType
@@ -169,9 +169,7 @@ internal class GraphQLNodeModulesEntityData : WorkspaceEntityData<GraphQLNodeMod
169169
}
170170

171171
override fun getMetadata(): EntityMetadata {
172-
return MetadataStorageImpl.getMetadataByTypeFqn(
173-
"com.intellij.lang.jsgraphql.javascript.workspace.GraphQLNodeModulesEntity"
174-
) as EntityMetadata
172+
return MetadataStorageImpl.getMetadataByTypeFqn("com.intellij.graphql.javascript.workspace.GraphQLNodeModulesEntity") as EntityMetadata
175173
}
176174

177175
override fun clone(): GraphQLNodeModulesEntityData {

‎gen/com/intellij/lang/jsgraphql/javascript/workspace/impl/MetadataStorageImpl.kt renamed to ‎javascript/gen/com/intellij/graphql/javascript/workspace/impl/MetadataStorageImpl.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.intellij.lang.jsgraphql.javascript.workspace.impl
1+
package com.intellij.graphql.javascript.workspace.impl
22

33
import com.intellij.platform.workspace.storage.WorkspaceEntityInternalApi
44
import com.intellij.platform.workspace.storage.metadata.impl.MetadataStorageBase
@@ -15,20 +15,20 @@ internal object MetadataStorageImpl: MetadataStorageBase() {
1515

1616
var typeMetadata: StorageTypeMetadata
1717

18-
typeMetadata = FinalClassMetadata.ObjectMetadata(fqName = "com.intellij.lang.jsgraphql.javascript.workspace.GraphQLNodeModulesEntitySource", properties = listOf(OwnPropertyMetadata(isComputable = false, isKey = false, isOpen = false, name = "virtualFileUrl", valueType = ValueTypeMetadata.SimpleType.CustomType(isNullable = true, typeMetadata = FinalClassMetadata.KnownClass(fqName = "com.intellij.platform.workspace.storage.url.VirtualFileUrl")), withDefault = false)), supertypes = listOf("com.intellij.platform.workspace.storage.EntitySource"))
18+
typeMetadata = FinalClassMetadata.ObjectMetadata(fqName = "com.intellij.graphql.javascript.workspace.GraphQLNodeModulesEntitySource", properties = listOf(OwnPropertyMetadata(isComputable = false, isKey = false, isOpen = false, name = "virtualFileUrl", valueType = ValueTypeMetadata.SimpleType.CustomType(isNullable = true, typeMetadata = FinalClassMetadata.KnownClass(fqName = "com.intellij.platform.workspace.storage.url.VirtualFileUrl")), withDefault = false)), supertypes = listOf("com.intellij.platform.workspace.storage.EntitySource"))
1919

2020
addMetadata(typeMetadata)
2121

22-
typeMetadata = EntityMetadata(fqName = "com.intellij.lang.jsgraphql.javascript.workspace.GraphQLNodeModulesEntity", entityDataFqName = "com.intellij.lang.jsgraphql.javascript.workspace.impl.GraphQLNodeModulesEntityData", supertypes = listOf("com.intellij.platform.workspace.storage.WorkspaceEntity"), properties = listOf(OwnPropertyMetadata(isComputable = false, isKey = false, isOpen = false, name = "entitySource", valueType = ValueTypeMetadata.SimpleType.CustomType(isNullable = false, typeMetadata = FinalClassMetadata.KnownClass(fqName = "com.intellij.platform.workspace.storage.EntitySource")), withDefault = false),
22+
typeMetadata = EntityMetadata(fqName = "com.intellij.graphql.javascript.workspace.GraphQLNodeModulesEntity", entityDataFqName = "com.intellij.graphql.javascript.workspace.impl.GraphQLNodeModulesEntityData", supertypes = listOf("com.intellij.platform.workspace.storage.WorkspaceEntity"), properties = listOf(OwnPropertyMetadata(isComputable = false, isKey = false, isOpen = false, name = "entitySource", valueType = ValueTypeMetadata.SimpleType.CustomType(isNullable = false, typeMetadata = FinalClassMetadata.KnownClass(fqName = "com.intellij.platform.workspace.storage.EntitySource")), withDefault = false),
2323
OwnPropertyMetadata(isComputable = false, isKey = false, isOpen = false, name = "roots", valueType = ValueTypeMetadata.ParameterizedType(generics = listOf(ValueTypeMetadata.SimpleType.CustomType(isNullable = false, typeMetadata = FinalClassMetadata.KnownClass(fqName = "com.intellij.platform.workspace.storage.url.VirtualFileUrl"))), primitive = primitiveTypeSetNotNullable), withDefault = false)), extProperties = listOf(), isAbstract = false)
2424

2525
addMetadata(typeMetadata)
2626
}
2727

2828
override fun initializeMetadataHash() {
29-
addMetadataHash(typeFqn = "com.intellij.lang.jsgraphql.javascript.workspace.GraphQLNodeModulesEntity", metadataHash = -1916821461)
30-
addMetadataHash(typeFqn = "com.intellij.platform.workspace.storage.EntitySource", metadataHash = -677383296)
31-
addMetadataHash(typeFqn = "com.intellij.lang.jsgraphql.javascript.workspace.GraphQLNodeModulesEntitySource", metadataHash = -373169652)
29+
addMetadataHash(typeFqn = "com.intellij.graphql.javascript.workspace.GraphQLNodeModulesEntity", metadataHash = -306196251)
30+
addMetadataHash(typeFqn = "com.intellij.platform.workspace.storage.EntitySource", metadataHash = -2106051587)
31+
addMetadataHash(typeFqn = "com.intellij.graphql.javascript.workspace.GraphQLNodeModulesEntitySource", metadataHash = -645610419)
3232
}
3333

3434
}

‎javascript/intellij.graphql.javascript.iml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="true">
4+
<exclude-output />
5+
<content url="file://$MODULE_DIR$">
6+
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
7+
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
8+
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
9+
</content>
10+
<orderEntry type="inheritedJdk" />
11+
<orderEntry type="sourceFolder" forTests="false" />
12+
<orderEntry type="library" name="kotlin-stdlib" level="project" />
13+
<orderEntry type="module" module-name="intellij.platform.ide" />
14+
<orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
15+
<orderEntry type="module" module-name="intellij.platform.ide.impl" />
16+
<orderEntry type="module" module-name="intellij.platform.lang" />
17+
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
18+
<orderEntry type="module" module-name="intellij.platform.core.impl" />
19+
<orderEntry type="module" module-name="intellij.platform.core" />
20+
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
21+
<orderEntry type="module" module-name="intellij.platform.analysis.impl" />
22+
<orderEntry type="module" module-name="intellij.platform.projectModel" />
23+
<orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
24+
<orderEntry type="module" module-name="intellij.platform.webide.impl" />
25+
<orderEntry type="module" module-name="intellij.platform.backend.workspace" />
26+
<orderEntry type="module" module-name="intellij.javascript" />
27+
<orderEntry type="module" module-name="intellij.javascript.impl" />
28+
<orderEntry type="module" module-name="intellij.javascript.parser" />
29+
<orderEntry type="module" module-name="intellij.javascript.frontback.impl" />
30+
<orderEntry type="module" module-name="intellij.platform.langInjection" />
31+
<orderEntry type="module" module-name="intellij.graphql" />
32+
<orderEntry type="library" name="gson" level="project" />
33+
</component>
34+
</module>

‎javascript/resources/intellij.graphql.javascript.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<idea-plugin package="com.intellij.graphql.javascript">
2+
<dependencies>
3+
<plugin id="com.intellij.modules.lang"/>
4+
<plugin id="org.intellij.intelliLang"/>
5+
<plugin id="JavaScript"/>
6+
</dependencies>
7+
8+
<extensions defaultExtensionNs="com.intellij">
9+
<!-- Language Injection -->
10+
<multiHostInjector implementation="com.intellij.graphql.javascript.injection.GraphQLJavaScriptLanguageInjector" order="first"/>
11+
12+
<!-- Workspace -->
13+
<workspaceModel.fileIndexContributor
14+
implementation="com.intellij.graphql.javascript.workspace.GraphQLNodeModulesIndexContributor"/>
15+
16+
<implicitUsageProvider implementation="com.intellij.graphql.javascript.usages.GraphQLConfigImplicitUsageProvider"/>
17+
18+
<registryKey key="graphql.reformat.injections.javascript"
19+
defaultValue="true"
20+
description="Enables reformatting GraphQL injections in JavaScript and TypeScript"/>
21+
</extensions>
22+
23+
<extensions defaultExtensionNs="com.intellij.lang.jsgraphql">
24+
<fileTypeContributor
25+
implementation="com.intellij.graphql.javascript.injection.GraphQLJavaScriptFileTypeContributor"/>
26+
<injectedLanguage implementation="com.intellij.graphql.javascript.injection.GraphQLJavaScriptInjectedLanguage"/>
27+
<configCustomLoader implementation="com.intellij.graphql.javascript.config.GraphQLJavaScriptConfigLoader"/>
28+
</extensions>
29+
30+
<projectListeners>
31+
<listener class="com.intellij.graphql.javascript.workspace.GraphQLNodeModulesLibraryUpdater$ConfigListener"
32+
topic="com.intellij.lang.jsgraphql.ide.config.GraphQLConfigListener"/>
33+
</projectListeners>
34+
</idea-plugin>

‎src/main/com/intellij/lang/jsgraphql/javascript/config/GraphQLJavaScriptConfigLoader.kt renamed to ‎javascript/src/com/intellij/graphql/javascript/config/GraphQLJavaScriptConfigLoader.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.intellij.lang.jsgraphql.javascript.config
1+
package com.intellij.graphql.javascript.config
22

33
import com.google.gson.Gson
44
import com.intellij.execution.process.CapturingProcessRunner

‎src/main/com/intellij/lang/jsgraphql/javascript/injection/GraphQLJavaScriptFileTypeContributor.kt renamed to ‎javascript/src/com/intellij/graphql/javascript/injection/GraphQLJavaScriptFileTypeContributor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* This source code is licensed under the MIT license found in the
66
* LICENSE file in the root directory of this source tree.
77
*/
8-
package com.intellij.lang.jsgraphql.javascript.injection
8+
package com.intellij.graphql.javascript.injection
99

1010
import com.intellij.lang.javascript.DialectDetector
1111
import com.intellij.lang.javascript.ecmascript6.TypeScriptUtil

‎src/main/com/intellij/lang/jsgraphql/javascript/injection/GraphQLJavaScriptInjectedLanguage.kt renamed to ‎javascript/src/com/intellij/graphql/javascript/injection/GraphQLJavaScriptInjectedLanguage.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* This source code is licensed under the MIT license found in the
66
* LICENSE file in the root directory of this source tree.
77
*/
8-
package com.intellij.lang.jsgraphql.javascript.injection
8+
package com.intellij.graphql.javascript.injection
99

1010
import com.intellij.lang.javascript.psi.JSElement
1111
import com.intellij.lang.javascript.psi.ecma6.JSStringTemplateExpression

‎src/main/com/intellij/lang/jsgraphql/javascript/injection/GraphQLJavaScriptInjectionUtils.kt renamed to ‎javascript/src/com/intellij/graphql/javascript/injection/GraphQLJavaScriptInjectionUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* This source code is licensed under the MIT license found in the
66
* LICENSE file in the root directory of this source tree.
77
*/
8-
package com.intellij.lang.jsgraphql.javascript.injection
8+
package com.intellij.graphql.javascript.injection
99

1010
import com.intellij.lang.javascript.JSTokenTypes
1111
import com.intellij.lang.javascript.patterns.JSPatterns

‎src/main/com/intellij/lang/jsgraphql/javascript/injection/GraphQLJavaScriptLanguageInjector.kt renamed to ‎javascript/src/com/intellij/graphql/javascript/injection/GraphQLJavaScriptLanguageInjector.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.intellij.lang.jsgraphql.javascript.injection
1+
package com.intellij.graphql.javascript.injection
22

33
import com.intellij.lang.injection.MultiHostInjector
44
import com.intellij.lang.injection.MultiHostRegistrar

0 commit comments

Comments
 (0)