getKey();
-
/**
* Returns the value of the value child.
*
@@ -78,7 +61,7 @@ public interface WidgetSetting extends DomElement {
*/
@NotNull
@com.intellij.util.xml.Attribute("value")
- GenericAttributeValue getValue2();
+ GenericAttributeValue getValue();
/**
@@ -92,7 +75,7 @@ public interface WidgetSetting extends DomElement {
*/
@NotNull
@com.intellij.util.xml.Attribute("type")
- GenericAttributeValue getType();
+ GenericAttributeValue getType();
}
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/CngPatterns.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/CngPatterns.kt
index 64e41a4ca..129b2602a 100644
--- a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/CngPatterns.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/CngPatterns.kt
@@ -23,32 +23,64 @@ import com.intellij.idea.plugin.hybris.common.utils.PsiXmlUtils
import com.intellij.idea.plugin.hybris.system.cockpitng.CngConfigDomFileDescription
import com.intellij.patterns.PlatformPatterns
import com.intellij.patterns.StandardPatterns
+import com.intellij.patterns.XmlAttributeValuePattern
import com.intellij.patterns.XmlPatterns
object CngPatterns {
- const val ROOT = "config"
- private const val CONTEXT = "context"
-
- private val cngFile = PlatformPatterns.psiFile()
+ const val CONFIG_ROOT = "config"
+ const val WIDGETS_ROOT = "widgets"
+ private const val CONFIG_CONTEXT = "context"
+ private val cngConfigFile = PlatformPatterns.psiFile()
.withName(StandardPatterns.string().endsWith(HybrisConstants.COCKPIT_NG_CONFIG_XML))
+ private val cngWidgetsFile = PlatformPatterns.psiFile()
+ .withName(StandardPatterns.string().endsWith(HybrisConstants.COCKPIT_NG_WIDGETS_XML))
+
+ val WIDGET_SETTING = widgetPattern("key", "setting")
+
+ val WIDGET_ID = XmlPatterns.or(
+ widgetPattern("widgetId", "widget-extension"),
+ widgetPattern("widgetId", "move"),
+ widgetPattern("widgetId", "remove"),
+ widgetPattern("targetWidgetId", "move")
+ )
+
+ val WIDGET_CONNECTION_WIDGET_ID = XmlPatterns.or (
+ widgetPattern("sourceWidgetId", "widget-connection"),
+ widgetPattern("targetWidgetId", "widget-connection"),
+ widgetPattern("sourceWidgetId", "widget-connection-remove"),
+ widgetPattern("targetWidgetId", "widget-connection-remove"),
+ )
+
+ val WIDGET_DEFINITION: XmlAttributeValuePattern = attributeValue(
+ "widgetDefinitionId",
+ "widget"
+ )
+ .inside(PsiXmlUtils.insideTagPattern(WIDGETS_ROOT))
+
+ val ACTION_DEFINITION = attributeValue(
+ "action-id",
+ "action"
+ )
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile)
val EDITOR_DEFINITION = XmlPatterns.or(
attributeValue(
"editor",
"field",
"advanced-search",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_CONFIG_ADVANCED_SEARCH
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_CONFIG_ADVANCED_SEARCH
)
- .inside(XmlPatterns.xmlTag().withLocalName(CONTEXT))
- .inFile(cngFile),
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile),
attributeValue(
"editor",
"attribute",
"editorArea",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_COMPONENT_EDITOR_AREA
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_COMPONENT_EDITOR_AREA
)
- .inside(XmlPatterns.xmlTag().withLocalName(CONTEXT))
- .inFile(cngFile)
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile)
)
val ITEM_ATTRIBUTE = XmlPatterns.or(
@@ -56,87 +88,87 @@ object CngPatterns {
"qualifier",
"column",
"list-view",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_COMPONENT_LIST_VIEW
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_COMPONENT_LIST_VIEW
)
.inside(
- XmlPatterns.xmlTag().withLocalName(CONTEXT)
+ XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT)
.andNot(XmlPatterns.xmlAttributeValue().withValue(StandardPatterns.string().oneOfIgnoreCase("."))),
)
- .inFile(cngFile),
+ .inFile(cngConfigFile),
attributeValue(
"qualifier",
"attribute",
"editorArea",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_COMPONENT_EDITOR_AREA
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_COMPONENT_EDITOR_AREA
)
- .inside(XmlPatterns.xmlTag().withLocalName(CONTEXT))
- .inFile(cngFile),
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile),
attributeValue(
"name",
"field",
"advanced-search",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_CONFIG_ADVANCED_SEARCH
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_CONFIG_ADVANCED_SEARCH
)
- .inside(XmlPatterns.xmlTag().withLocalName(CONTEXT))
- .inFile(cngFile),
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile),
attributeValue(
"name",
"field",
"simple-search",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_CONFIG_SIMPLE_SEARCH
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_CONFIG_SIMPLE_SEARCH
)
- .inside(XmlPatterns.xmlTag().withLocalName(CONTEXT))
- .inFile(cngFile)
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile)
)
val FLOW_STEP_CONTENT_PROPERTY_QUALIFIER = attributeValue(
"qualifier",
"property",
"property-list",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_CONFIG_WIZARD_CONFIG
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_CONFIG_WIZARD_CONFIG
)
- .inside(XmlPatterns.xmlTag().withLocalName(CONTEXT))
- .inFile(cngFile)
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile)
val FLOW_INITIALIZE_TYPE = attributeValue(
"type",
"initialize",
"prepare",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_CONFIG_WIZARD_CONFIG
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_CONFIG_WIZARD_CONFIG
)
- .inside(XmlPatterns.xmlTag().withLocalName(CONTEXT))
- .inFile(cngFile)
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile)
val ITEM_TYPE = XmlPatterns.or(
- PsiXmlUtils.tagAttributeValuePattern(ROOT, CONTEXT, "type")
+ PsiXmlUtils.tagAttributeValuePattern(CONFIG_ROOT, CONFIG_CONTEXT, "type")
.andNot(XmlPatterns.xmlAttributeValue().withValue(StandardPatterns.string().contains(".")))
- .inFile(cngFile),
+ .inFile(cngConfigFile),
- PsiXmlUtils.tagAttributeValuePattern(ROOT, CONTEXT, "parent")
+ PsiXmlUtils.tagAttributeValuePattern(CONFIG_ROOT, CONFIG_CONTEXT, "parent")
.andNot(XmlPatterns.xmlAttributeValue().withValue(StandardPatterns.string().oneOfIgnoreCase("auto", ".")))
- .inFile(cngFile),
+ .inFile(cngConfigFile),
attributeValue(
"type",
"property",
"content",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_CONFIG_WIZARD_CONFIG
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_CONFIG_WIZARD_CONFIG
)
.andNot(XmlPatterns.xmlAttributeValue().withValue(StandardPatterns.string().contains(".")))
- .inside(XmlPatterns.xmlTag().withLocalName(CONTEXT))
- .inFile(cngFile),
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile),
attributeValue(
"code",
"type-node",
"explorer-tree",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_CONFIG_EXPLORER_TREE
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_CONFIG_EXPLORER_TREE
)
- .inside(XmlPatterns.xmlTag().withLocalName(CONTEXT))
- .inFile(cngFile)
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile)
)
val SPRING_BEAN = XmlPatterns.or(
@@ -144,82 +176,82 @@ object CngPatterns {
"spring-bean",
"mold",
"collection-browser",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_CONFIG_COLLECTION_BROWSER
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_CONFIG_COLLECTION_BROWSER
)
- .inside(XmlPatterns.xmlTag().withLocalName(CONTEXT))
- .inFile(cngFile),
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile),
attributeValue(
"spring-bean",
"column",
"list-view",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_COMPONENT_LIST_VIEW
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_COMPONENT_LIST_VIEW
)
- .inside(XmlPatterns.xmlTag().withLocalName(CONTEXT))
- .inFile(cngFile),
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile),
attributeValue(
"spring-bean",
"customPanel",
"editorArea",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_COMPONENT_EDITOR_AREA
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_COMPONENT_EDITOR_AREA
)
- .inside(XmlPatterns.xmlTag().withLocalName(CONTEXT))
- .inFile(cngFile),
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile),
attributeValue(
"spring-bean",
"customSection",
"editorArea",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_COMPONENT_EDITOR_AREA
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_COMPONENT_EDITOR_AREA
)
- .inside(XmlPatterns.xmlTag().withLocalName(CONTEXT))
- .inFile(cngFile),
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile),
attributeValue(
"spring-bean",
"customTab",
"editorArea",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_COMPONENT_EDITOR_AREA
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_COMPONENT_EDITOR_AREA
)
- .inside(XmlPatterns.xmlTag().withLocalName(CONTEXT))
- .inFile(cngFile),
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile),
attributeValue(
"spring-bean",
"renderer",
"flow",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_CONFIG_WIZARD_CONFIG
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_CONFIG_WIZARD_CONFIG
)
- .inside(XmlPatterns.xmlTag().withLocalName(CONTEXT))
- .inFile(cngFile),
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile),
attributeValue(
"spring-bean",
"renderer",
"compare-view",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_COMPONENT_COMPARE_VIEW
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_COMPONENT_COMPARE_VIEW
)
- .inside(XmlPatterns.xmlTag().withLocalName(CONTEXT))
- .inFile(cngFile),
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile),
attributeValue(
"spring-bean",
"custom-attribute",
"summary-view",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_COMPONENT_SUMMARY_VIEW
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_COMPONENT_SUMMARY_VIEW
)
- .inside(XmlPatterns.xmlTag().withLocalName(CONTEXT))
- .inFile(cngFile),
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile),
attributeValue(
"spring-bean",
"additionalRenderer",
"grid-view",
- CngConfigDomFileDescription.NAMESPACE_COCKPITNG_COMPONENT_GRID_VIEW
+ CngConfigDomFileDescription.NAMESPACE_COCKPIT_NG_COMPONENT_GRID_VIEW
)
- .inside(XmlPatterns.xmlTag().withLocalName(CONTEXT))
- .inFile(cngFile)
+ .inside(XmlPatterns.xmlTag().withLocalName(CONFIG_CONTEXT))
+ .inFile(cngConfigFile)
)
private fun attributeValue(
@@ -242,4 +274,39 @@ object CngPatterns {
)
)
+ private fun attributeValue(
+ attribute: String,
+ tag: String,
+ wrappingTag: String,
+ ) = XmlPatterns.xmlAttributeValue()
+ .withParent(
+ XmlPatterns.xmlAttribute()
+ .withLocalName(attribute)
+ .withParent(
+ XmlPatterns.xmlTag()
+ .withLocalName(tag)
+ .inside(
+ XmlPatterns.xmlTag()
+ .withLocalName(wrappingTag)
+ )
+ )
+ )
+
+ private fun attributeValue(
+ attribute: String,
+ tag: String,
+ ) = XmlPatterns.xmlAttributeValue()
+ .withParent(
+ XmlPatterns.xmlAttribute()
+ .withLocalName(attribute)
+ .withParent(
+ XmlPatterns.xmlTag()
+ .withLocalName(tag)
+ )
+ )
+
+ private fun widgetPattern(attribute: String, tag: String) = attributeValue(attribute, tag)
+ .inside(PsiXmlUtils.insideTagPattern(WIDGETS_ROOT))
+ .inFile(cngWidgetsFile)
+
}
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/contributor/CngReferenceContributor.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/contributor/CngReferenceContributor.kt
index bc4efa49d..1f2040877 100644
--- a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/contributor/CngReferenceContributor.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/contributor/CngReferenceContributor.kt
@@ -19,7 +19,6 @@ package com.intellij.idea.plugin.hybris.system.cockpitng.psi.contributor
import com.intellij.idea.plugin.hybris.system.cockpitng.psi.CngPatterns
import com.intellij.idea.plugin.hybris.system.cockpitng.psi.provider.*
-import com.intellij.patterns.XmlPatterns
import com.intellij.psi.PsiReferenceContributor
import com.intellij.psi.PsiReferenceRegistrar
@@ -46,5 +45,25 @@ class CngReferenceContributor : PsiReferenceContributor() {
CngPatterns.ITEM_ATTRIBUTE,
CngTSItemAttributeReferenceProvider.instance
)
+ registrar.registerReferenceProvider(
+ CngPatterns.ACTION_DEFINITION,
+ CngActionDefinitionReferenceProvider.instance
+ )
+ registrar.registerReferenceProvider(
+ CngPatterns.WIDGET_ID,
+ CngWidgetReferenceProvider.instance
+ )
+ registrar.registerReferenceProvider(
+ CngPatterns.WIDGET_CONNECTION_WIDGET_ID,
+ CngWidgetConnectionWidgetIdReferenceProvider.instance
+ )
+ registrar.registerReferenceProvider(
+ CngPatterns.WIDGET_DEFINITION,
+ CngWidgetDefinitionReferenceProvider.instance
+ )
+ registrar.registerReferenceProvider(
+ CngPatterns.WIDGET_SETTING,
+ CngWidgetSettingReferenceProvider.instance
+ )
}
}
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/provider/CngActionDefinitionReferenceProvider.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/provider/CngActionDefinitionReferenceProvider.kt
new file mode 100644
index 000000000..54a0c82bb
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/provider/CngActionDefinitionReferenceProvider.kt
@@ -0,0 +1,36 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+package com.intellij.idea.plugin.hybris.system.cockpitng.psi.provider
+
+import com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference.CngActionDefinitionReference
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiReferenceProvider
+import com.intellij.util.ProcessingContext
+
+class CngActionDefinitionReferenceProvider : PsiReferenceProvider() {
+
+ override fun getReferencesByElement(
+ element: PsiElement, context: ProcessingContext
+ ) = arrayOf(CngActionDefinitionReference(element))
+
+ companion object {
+ val instance: PsiReferenceProvider = ApplicationManager.getApplication().getService(CngActionDefinitionReferenceProvider::class.java)
+ private val regex = "(\\{)(.*?)(})|([,)\"])".toRegex()
+ }
+}
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/provider/CngWidgetConnectionWidgetIdReferenceProvider.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/provider/CngWidgetConnectionWidgetIdReferenceProvider.kt
new file mode 100644
index 000000000..151b06e10
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/provider/CngWidgetConnectionWidgetIdReferenceProvider.kt
@@ -0,0 +1,40 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+package com.intellij.idea.plugin.hybris.system.cockpitng.psi.provider
+
+import com.intellij.idea.plugin.hybris.common.HybrisConstants
+import com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference.CngWidgetReference
+import com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference.CngWidgetStubReference
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiReferenceProvider
+import com.intellij.psi.xml.XmlAttributeValue
+import com.intellij.util.ProcessingContext
+
+class CngWidgetConnectionWidgetIdReferenceProvider : PsiReferenceProvider() {
+
+ override fun getReferencesByElement(element: PsiElement, context: ProcessingContext) =
+ if (element is XmlAttributeValue)
+ if (element.value.startsWith(HybrisConstants.COCKPIT_NG_WIDGET_ID_STUB, true)) arrayOf(CngWidgetStubReference(element))
+ else arrayOf(CngWidgetReference(element))
+ else emptyArray()
+
+ companion object {
+ val instance: PsiReferenceProvider = ApplicationManager.getApplication().getService(CngWidgetConnectionWidgetIdReferenceProvider::class.java)
+ }
+}
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/provider/CngWidgetDefinitionReferenceProvider.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/provider/CngWidgetDefinitionReferenceProvider.kt
new file mode 100644
index 000000000..4a4f67864
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/provider/CngWidgetDefinitionReferenceProvider.kt
@@ -0,0 +1,35 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+package com.intellij.idea.plugin.hybris.system.cockpitng.psi.provider
+
+import com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference.CngWidgetDefinitionReference
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiReferenceProvider
+import com.intellij.util.ProcessingContext
+
+class CngWidgetDefinitionReferenceProvider : PsiReferenceProvider() {
+
+ override fun getReferencesByElement(
+ element: PsiElement, context: ProcessingContext
+ ) = arrayOf(CngWidgetDefinitionReference(element))
+
+ companion object {
+ val instance: PsiReferenceProvider = ApplicationManager.getApplication().getService(CngWidgetDefinitionReferenceProvider::class.java)
+ }
+}
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/provider/CngWidgetReferenceProvider.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/provider/CngWidgetReferenceProvider.kt
new file mode 100644
index 000000000..b761547f8
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/provider/CngWidgetReferenceProvider.kt
@@ -0,0 +1,35 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+package com.intellij.idea.plugin.hybris.system.cockpitng.psi.provider
+
+import com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference.CngWidgetReference
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiReferenceProvider
+import com.intellij.util.ProcessingContext
+
+class CngWidgetReferenceProvider : PsiReferenceProvider() {
+
+ override fun getReferencesByElement(
+ element: PsiElement, context: ProcessingContext
+ ) = arrayOf(CngWidgetReference(element))
+
+ companion object {
+ val instance: PsiReferenceProvider = ApplicationManager.getApplication().getService(CngWidgetReferenceProvider::class.java)
+ }
+}
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/provider/CngWidgetSettingReferenceProvider.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/provider/CngWidgetSettingReferenceProvider.kt
new file mode 100644
index 000000000..83b8fb8ff
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/provider/CngWidgetSettingReferenceProvider.kt
@@ -0,0 +1,35 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+package com.intellij.idea.plugin.hybris.system.cockpitng.psi.provider
+
+import com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference.CngWidgetSettingReference
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiReferenceProvider
+import com.intellij.util.ProcessingContext
+
+class CngWidgetSettingReferenceProvider : PsiReferenceProvider() {
+
+ override fun getReferencesByElement(
+ element: PsiElement, context: ProcessingContext
+ ) = arrayOf(CngWidgetSettingReference(element))
+
+ companion object {
+ val instance: PsiReferenceProvider = ApplicationManager.getApplication().getService(CngWidgetSettingReferenceProvider::class.java)
+ }
+}
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngActionDefinitionReference.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngActionDefinitionReference.kt
new file mode 100644
index 000000000..4dfe34140
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngActionDefinitionReference.kt
@@ -0,0 +1,36 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference
+
+import com.intellij.codeInsight.highlighting.HighlightedReference
+import com.intellij.idea.plugin.hybris.system.cockpitng.meta.CngMetaModelAccess
+import com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference.result.ActionDefinitionResolveResult
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiPolyVariantReference
+import com.intellij.psi.PsiReferenceBase
+
+class CngActionDefinitionReference(element: PsiElement) : PsiReferenceBase.Poly(element),
+ PsiPolyVariantReference, HighlightedReference {
+
+ override fun multiResolve(incompleteCode: Boolean) = CngMetaModelAccess.getInstance(element.project).getMetaModel()
+ .actionDefinitions[value]
+ ?.retrieveDom()
+ ?.let { arrayOf(ActionDefinitionResolveResult(it)) }
+ ?: emptyArray()
+}
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngEditorDefinitionReference.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngEditorDefinitionReference.kt
index 818d91376..f3c392680 100644
--- a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngEditorDefinitionReference.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngEditorDefinitionReference.kt
@@ -20,21 +20,18 @@ package com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference
import com.intellij.codeInsight.highlighting.HighlightedReference
import com.intellij.idea.plugin.hybris.system.cockpitng.meta.CngMetaModelAccess
+import com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference.result.EditorDefinitionResolveResult
import com.intellij.openapi.util.TextRange
import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiElementResolveResult
import com.intellij.psi.PsiPolyVariantReference
import com.intellij.psi.PsiReferenceBase
-open class CngEditorDefinitionReference(element: PsiElement, textRange: TextRange) : PsiReferenceBase.Poly(element, textRange, false),
+class CngEditorDefinitionReference(element: PsiElement, textRange: TextRange) : PsiReferenceBase.Poly(element, textRange, false),
PsiPolyVariantReference, HighlightedReference {
override fun multiResolve(incompleteCode: Boolean) = CngMetaModelAccess.getInstance(element.project).getMetaModel()
.editorDefinitions[value]
?.retrieveDom()
- ?.id
- ?.xmlAttributeValue
- ?.navigationElement
- ?.let { arrayOf(PsiElementResolveResult(it)) }
+ ?.let { arrayOf(EditorDefinitionResolveResult(it)) }
?: emptyArray()
}
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/util/xml/CngActionDefinitionIdConverter.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngWidgetDefinitionReference.kt
similarity index 51%
rename from src/com/intellij/idea/plugin/hybris/system/cockpitng/util/xml/CngActionDefinitionIdConverter.kt
rename to src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngWidgetDefinitionReference.kt
index c096ec313..a2de1fbaa 100644
--- a/src/com/intellij/idea/plugin/hybris/system/cockpitng/util/xml/CngActionDefinitionIdConverter.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngWidgetDefinitionReference.kt
@@ -16,30 +16,27 @@
* along with this program. If not, see .
*/
-package com.intellij.idea.plugin.hybris.system.cockpitng.util.xml
+package com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference
+import com.intellij.codeInsight.highlighting.HighlightedReference
import com.intellij.idea.plugin.hybris.system.cockpitng.meta.CngMetaModelAccess
-import com.intellij.idea.plugin.hybris.system.cockpitng.model.core.ActionDefinition
-import com.intellij.util.xml.ConvertContext
-import com.intellij.util.xml.ResolvingConverter
+import com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference.result.WidgetDefinitionResolveResult
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiPolyVariantReference
+import com.intellij.psi.PsiReferenceBase
+import com.intellij.psi.ResolveResult
-class CngActionDefinitionIdConverter : ResolvingConverter() {
+class CngWidgetDefinitionReference(element: PsiElement) : PsiReferenceBase.Poly(element), PsiPolyVariantReference,
+ HighlightedReference {
- override fun toString(t: ActionDefinition?, context: ConvertContext?) = t?.id?.stringValue
+ override fun multiResolve(incompleteCode: Boolean): Array {
+ val lookingForName = value
- override fun fromString(s: String?, context: ConvertContext): ActionDefinition? {
- if (s == null) return null
-
- return CngMetaModelAccess.getInstance(context.project).getMetaModel()
- .actionDefinitions[s]
+ return CngMetaModelAccess.getInstance(element.project).getMetaModel()
+ .widgetDefinitions[lookingForName]
?.retrieveDom()
+ ?.let { arrayOf(WidgetDefinitionResolveResult(it)) }
+ ?: emptyArray()
}
- override fun getVariants(context: ConvertContext): Collection {
- return CngMetaModelAccess.getInstance(context.project).getMetaModel()
- .actionDefinitions
- .values
- .mapNotNull { it.retrieveDom() }
- }
-
-}
\ No newline at end of file
+}
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngWidgetReference.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngWidgetReference.kt
new file mode 100644
index 000000000..89a87911f
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngWidgetReference.kt
@@ -0,0 +1,47 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference
+
+import com.intellij.codeInsight.highlighting.HighlightedReference
+import com.intellij.idea.plugin.hybris.impex.psi.references.result.EnumResolveResult
+import com.intellij.idea.plugin.hybris.impex.psi.references.result.ItemResolveResult
+import com.intellij.idea.plugin.hybris.impex.psi.references.result.RelationResolveResult
+import com.intellij.idea.plugin.hybris.system.cockpitng.meta.CngMetaModelAccess
+import com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference.result.WidgetResolveResult
+import com.intellij.idea.plugin.hybris.system.type.meta.model.TSGlobalMetaEnum
+import com.intellij.idea.plugin.hybris.system.type.meta.model.TSGlobalMetaItem
+import com.intellij.idea.plugin.hybris.system.type.meta.model.TSGlobalMetaRelation
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiPolyVariantReference
+import com.intellij.psi.PsiReferenceBase
+import com.intellij.psi.ResolveResult
+
+class CngWidgetReference(element: PsiElement) : PsiReferenceBase.Poly(element), PsiPolyVariantReference, HighlightedReference {
+
+ override fun multiResolve(incompleteCode: Boolean): Array {
+ val lookingForName = value
+
+ return CngMetaModelAccess.getInstance(element.project).getMetaModel()
+ .widgets[lookingForName]
+ ?.retrieveDom()
+ ?.let { arrayOf(WidgetResolveResult(it)) }
+ ?: emptyArray()
+ }
+
+}
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngWidgetSettingReference.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngWidgetSettingReference.kt
new file mode 100644
index 000000000..da9ead4a3
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngWidgetSettingReference.kt
@@ -0,0 +1,50 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference
+
+import com.intellij.idea.plugin.hybris.system.cockpitng.meta.CngMetaModelAccess
+import com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference.result.WidgetSettingResolveResult
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiPolyVariantReference
+import com.intellij.psi.PsiReferenceBase
+import com.intellij.psi.ResolveResult
+import com.intellij.psi.util.parentsOfType
+import com.intellij.psi.xml.XmlTag
+
+/**
+ * See https://help.sap.com/docs/SAP_COMMERCE/5c9ea0c629214e42b727bf08800d8dfa/76d2195f994a47f593a2732ef99c91d3.html?locale=en-US&q=socket
+ */
+class CngWidgetSettingReference(element: PsiElement) : PsiReferenceBase.Poly(element, true), PsiPolyVariantReference {
+
+ override fun multiResolve(incompleteCode: Boolean): Array {
+ val lookingForName = value
+ val widgetDefinitionId = element.parentsOfType()
+ .firstOrNull { it.localName == "widget" }
+ ?.getAttributeValue("widgetDefinitionId")
+ ?: return emptyArray()
+
+ return CngMetaModelAccess.getInstance(element.project).getMetaModel()
+ .widgetDefinitions[widgetDefinitionId]
+ ?.settings?.get(lookingForName)
+ ?.retrieveDom()
+ ?.let { arrayOf(WidgetSettingResolveResult(it)) }
+ ?: emptyArray()
+ }
+
+}
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngWidgetStubReference.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngWidgetStubReference.kt
new file mode 100644
index 000000000..66cbcf310
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/CngWidgetStubReference.kt
@@ -0,0 +1,51 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference
+
+import com.intellij.codeInsight.highlighting.HighlightedReference
+import com.intellij.idea.plugin.hybris.common.HybrisConstants
+import com.intellij.idea.plugin.hybris.system.cockpitng.meta.CngMetaModelAccess
+import com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference.result.ActionDefinitionResolveResult
+import com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference.result.EditorDefinitionResolveResult
+import com.intellij.openapi.util.TextRange
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiPolyVariantReference
+import com.intellij.psi.PsiReferenceBase
+import com.intellij.psi.ResolveResult
+
+class CngWidgetStubReference(element: PsiElement) : PsiReferenceBase.Poly(element), PsiPolyVariantReference, HighlightedReference {
+
+ override fun calculateDefaultRangeInElement() = TextRange.from(stubLength + 1, element.textLength - stubLength - HybrisConstants.QUOTE_LENGTH)
+
+ override fun multiResolve(incompleteCode: Boolean): Array {
+ val metaModel = CngMetaModelAccess.getInstance(element.project).getMetaModel()
+ return metaModel
+ .editorDefinitions[value]
+ ?.retrieveDom()
+ ?.let { arrayOf(EditorDefinitionResolveResult(it)) }
+ ?: metaModel.actionDefinitions[value]
+ ?.retrieveDom()
+ ?.let { arrayOf(ActionDefinitionResolveResult(it)) }
+ ?: emptyArray()
+ }
+
+ companion object {
+ private const val stubLength = HybrisConstants.COCKPIT_NG_WIDGET_ID_STUB.length
+ }
+}
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/result/ActionDefinitionResolveResult.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/result/ActionDefinitionResolveResult.kt
new file mode 100644
index 000000000..424e3528e
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/result/ActionDefinitionResolveResult.kt
@@ -0,0 +1,27 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference.result
+
+import com.intellij.idea.plugin.hybris.system.cockpitng.model.core.ActionDefinition
+import com.intellij.psi.ResolveResult
+
+class ActionDefinitionResolveResult(private val myDom: ActionDefinition) : ResolveResult {
+ override fun getElement() = myDom.id.xmlAttributeValue
+ override fun isValidResult() = element != null
+}
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/result/EditorDefinitionResolveResult.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/result/EditorDefinitionResolveResult.kt
new file mode 100644
index 000000000..185d8c7ab
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/result/EditorDefinitionResolveResult.kt
@@ -0,0 +1,28 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference.result
+
+import com.intellij.idea.plugin.hybris.system.cockpitng.model.core.EditorDefinition
+import com.intellij.idea.plugin.hybris.system.cockpitng.model.core.Widget
+import com.intellij.psi.ResolveResult
+
+class EditorDefinitionResolveResult(private val myDom: EditorDefinition) : ResolveResult {
+ override fun getElement() = myDom.id.xmlAttributeValue
+ override fun isValidResult() = element != null
+}
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/result/WidgetDefinitionResolveResult.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/result/WidgetDefinitionResolveResult.kt
new file mode 100644
index 000000000..e22fe47ee
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/result/WidgetDefinitionResolveResult.kt
@@ -0,0 +1,27 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference.result
+
+import com.intellij.idea.plugin.hybris.system.cockpitng.model.core.WidgetDefinition
+import com.intellij.psi.ResolveResult
+
+class WidgetDefinitionResolveResult(private val myDom: WidgetDefinition) : ResolveResult {
+ override fun getElement() = myDom.id.xmlAttributeValue
+ override fun isValidResult() = element != null
+}
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/model/config/ConfigGenericAttributeValue.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/result/WidgetResolveResult.kt
similarity index 68%
rename from src/com/intellij/idea/plugin/hybris/system/cockpitng/model/config/ConfigGenericAttributeValue.kt
rename to src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/result/WidgetResolveResult.kt
index 0d274282a..5b011cceb 100644
--- a/src/com/intellij/idea/plugin/hybris/system/cockpitng/model/config/ConfigGenericAttributeValue.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/result/WidgetResolveResult.kt
@@ -16,11 +16,12 @@
* along with this program. If not, see .
*/
-package com.intellij.idea.plugin.hybris.system.cockpitng.model.config
+package com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference.result
-import com.intellij.idea.plugin.hybris.common.HybrisConstants
-import com.intellij.util.xml.GenericAttributeValue
-import com.intellij.util.xml.Namespace
+import com.intellij.idea.plugin.hybris.system.cockpitng.model.core.Widget
+import com.intellij.psi.ResolveResult
-@Namespace(HybrisConstants.COCKPIT_NG_NAMESPACE_KEY)
-interface ConfigGenericAttributeValue : GenericAttributeValue
\ No newline at end of file
+class WidgetResolveResult(private val myDom: Widget) : ResolveResult {
+ override fun getElement() = myDom.id.xmlAttributeValue
+ override fun isValidResult() = element != null
+}
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/result/WidgetSettingResolveResult.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/result/WidgetSettingResolveResult.kt
new file mode 100644
index 000000000..48f5908b4
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/psi/reference/result/WidgetSettingResolveResult.kt
@@ -0,0 +1,27 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.intellij.idea.plugin.hybris.system.cockpitng.psi.reference.result
+
+import com.intellij.idea.plugin.hybris.system.cockpitng.model.core.Setting
+import com.intellij.psi.ResolveResult
+
+class WidgetSettingResolveResult(private val myDom: Setting) : ResolveResult {
+ override fun getElement() = myDom.key.xmlAttributeValue
+ override fun isValidResult() = element != null
+}
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/util/xml/CngWidgetDefinitionIdConverter.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/util/xml/CngWidgetDefinitionIdConverter.kt
deleted file mode 100644
index af1e38023..000000000
--- a/src/com/intellij/idea/plugin/hybris/system/cockpitng/util/xml/CngWidgetDefinitionIdConverter.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019 EPAM Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see .
- */
-
-package com.intellij.idea.plugin.hybris.system.cockpitng.util.xml
-
-import com.intellij.idea.plugin.hybris.system.cockpitng.meta.CngMetaModelAccess
-import com.intellij.idea.plugin.hybris.system.cockpitng.model.core.WidgetDefinition
-import com.intellij.util.xml.ConvertContext
-import com.intellij.util.xml.ResolvingConverter
-
-class CngWidgetDefinitionIdConverter : ResolvingConverter() {
-
- override fun toString(t: WidgetDefinition?, context: ConvertContext?) = t?.id?.stringValue
-
- override fun fromString(s: String?, context: ConvertContext): WidgetDefinition? {
- if (s == null) return null
-
- return CngMetaModelAccess.getInstance(context.project).getMetaModel()
- .widgetDefinitions[s]
- ?.retrieveDom()
- }
-
- override fun getVariants(context: ConvertContext): Collection {
- return CngMetaModelAccess.getInstance(context.project).getMetaModel()
- .widgetDefinitions
- .values
- .mapNotNull { it.retrieveDom() }
- }
-
-}
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/system/type/meta/impl/TSMetaModelAccessImpl.kt b/src/com/intellij/idea/plugin/hybris/system/type/meta/impl/TSMetaModelAccessImpl.kt
index 566ff8253..9e3527be6 100644
--- a/src/com/intellij/idea/plugin/hybris/system/type/meta/impl/TSMetaModelAccessImpl.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/type/meta/impl/TSMetaModelAccessImpl.kt
@@ -75,14 +75,13 @@ class TSMetaModelAccessImpl(private val myProject: Project) : TSMetaModelAccess
)
override fun getMetaModel(): TSGlobalMetaModel {
- return DumbService.getInstance(myProject).tryRunReadActionInSmartMode(
+ return DumbService.getInstance(myProject).runReadActionInSmartMode(
Computable {
if (myGlobalMetaModel.hasUpToDateValue() || lock.isWriteLocked || writeLock.isHeldByCurrentThread) {
return@Computable readMetaModelWithLock()
}
return@Computable writeMetaModelWithLock()
- },
- "Computing Type System"
+ }
) ?: throw ProcessCanceledException()
}
diff --git a/src/com/intellij/idea/plugin/hybris/toolwindow/system/bean/components/BSTreePanel.kt b/src/com/intellij/idea/plugin/hybris/toolwindow/system/bean/components/BSTreePanel.kt
index 1a0531320..5daef8655 100644
--- a/src/com/intellij/idea/plugin/hybris/toolwindow/system/bean/components/BSTreePanel.kt
+++ b/src/com/intellij/idea/plugin/hybris/toolwindow/system/bean/components/BSTreePanel.kt
@@ -57,16 +57,11 @@ class BSTreePanel(
secondComponent = myDefaultPanel
myTree.addTreeSelectionListener(myTreeSelectionListener)
-
- myProject.messageBus.connect(this).subscribe(BSMetaModelAccessImpl.topic, object : BSChangeListener {
- override fun beanSystemChanged(globalMetaModel: BSGlobalMetaModel) {
- secondComponent = myDefaultPanel;
- myTree.update(BSViewSettings.ChangeType.FULL)
- }
- })
}
fun update(changeType: BSViewSettings.ChangeType) {
+ secondComponent = myDefaultPanel;
+
myTree.update(changeType)
}
diff --git a/src/com/intellij/idea/plugin/hybris/toolwindow/system/bean/view/BSView.kt b/src/com/intellij/idea/plugin/hybris/toolwindow/system/bean/view/BSView.kt
index 20a431aa1..164ef3303 100644
--- a/src/com/intellij/idea/plugin/hybris/toolwindow/system/bean/view/BSView.kt
+++ b/src/com/intellij/idea/plugin/hybris/toolwindow/system/bean/view/BSView.kt
@@ -21,8 +21,10 @@ package com.intellij.idea.plugin.hybris.toolwindow.system.bean.view
import com.intellij.icons.AllIcons
import com.intellij.ide.IdeBundle
import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils.message
+import com.intellij.idea.plugin.hybris.system.bean.meta.BSChangeListener
+import com.intellij.idea.plugin.hybris.system.bean.meta.BSGlobalMetaModel
+import com.intellij.idea.plugin.hybris.system.bean.meta.impl.BSMetaModelAccessImpl
import com.intellij.idea.plugin.hybris.toolwindow.system.bean.components.BSTreePanel
-import com.intellij.idea.plugin.hybris.toolwindow.system.type.view.TSViewSettings
import com.intellij.openapi.Disposable
import com.intellij.openapi.actionSystem.ActionManager
import com.intellij.openapi.actionSystem.DefaultActionGroup
@@ -53,14 +55,8 @@ class BSView(val myProject: Project) : SimpleToolWindowPanel(false, true), Dispo
setContent(panel)
}
- DumbService.getInstance(myProject).runWhenSmart {
- setContent(myTreePane);
-
- Disposer.register(this, myTreePane)
- myTreePane.update(BSViewSettings.ChangeType.FULL)
-
- installSettingsListener()
- }
+ Disposer.register(this, myTreePane)
+ installSettingsListener()
}
private fun installToolbar() {
@@ -78,6 +74,15 @@ class BSView(val myProject: Project) : SimpleToolWindowPanel(false, true), Dispo
myTreePane.update(changeType)
}
})
+ myProject.messageBus.connect(this).subscribe(BSMetaModelAccessImpl.topic, object : BSChangeListener {
+ override fun beanSystemChanged(globalMetaModel: BSGlobalMetaModel) {
+ myTreePane.update(BSViewSettings.ChangeType.FULL)
+
+ if (content != myTreePane) {
+ setContent(myTreePane)
+ }
+ }
+ })
}
private fun initBeansViewActionGroup(): DefaultActionGroup = with(
diff --git a/src/com/intellij/idea/plugin/hybris/toolwindow/system/type/components/TSTreePanel.kt b/src/com/intellij/idea/plugin/hybris/toolwindow/system/type/components/TSTreePanel.kt
index e0a953707..e5dc8cd33 100644
--- a/src/com/intellij/idea/plugin/hybris/toolwindow/system/type/components/TSTreePanel.kt
+++ b/src/com/intellij/idea/plugin/hybris/toolwindow/system/type/components/TSTreePanel.kt
@@ -52,16 +52,11 @@ class TSTreePanel(
secondComponent = myDefaultPanel
myTree.addTreeSelectionListener(myTreeSelectionListener)
-
- myProject.messageBus.connect(this).subscribe(TSMetaModelAccessImpl.topic, object : TSChangeListener {
- override fun typeSystemChanged(globalMetaModel: TSGlobalMetaModel) {
- secondComponent = myDefaultPanel;
- myTree.update(TSViewSettings.ChangeType.FULL)
- }
- })
}
fun update(changeType: TSViewSettings.ChangeType) {
+ secondComponent = myDefaultPanel;
+
myTree.update(changeType)
}
diff --git a/src/com/intellij/idea/plugin/hybris/toolwindow/system/type/tree/TSTreeModel.kt b/src/com/intellij/idea/plugin/hybris/toolwindow/system/type/tree/TSTreeModel.kt
index 58facbc98..1ca73c87e 100644
--- a/src/com/intellij/idea/plugin/hybris/toolwindow/system/type/tree/TSTreeModel.kt
+++ b/src/com/intellij/idea/plugin/hybris/toolwindow/system/type/tree/TSTreeModel.kt
@@ -52,9 +52,13 @@ class TSTreeModel(private val root: TSNode)
treeNodesChanged(null, null, null)
}
- class Node(private val node : TSNode?) : DefaultMutableTreeNode(node) {
+ class Node(private val node: TSNode?) : DefaultMutableTreeNode(node) {
override fun toString() = node.toString()
+
+ companion object {
+ private const val serialVersionUID: Long = -4729552031003080261L
+ }
}
override fun getInvoker() = myInvoker
diff --git a/src/com/intellij/idea/plugin/hybris/toolwindow/system/type/view/TSView.kt b/src/com/intellij/idea/plugin/hybris/toolwindow/system/type/view/TSView.kt
index c6601c140..11c9ab2a1 100644
--- a/src/com/intellij/idea/plugin/hybris/toolwindow/system/type/view/TSView.kt
+++ b/src/com/intellij/idea/plugin/hybris/toolwindow/system/type/view/TSView.kt
@@ -21,6 +21,9 @@ package com.intellij.idea.plugin.hybris.toolwindow.system.type.view
import com.intellij.icons.AllIcons
import com.intellij.ide.IdeBundle
import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils.message
+import com.intellij.idea.plugin.hybris.system.type.meta.TSChangeListener
+import com.intellij.idea.plugin.hybris.system.type.meta.TSGlobalMetaModel
+import com.intellij.idea.plugin.hybris.system.type.meta.impl.TSMetaModelAccessImpl
import com.intellij.idea.plugin.hybris.toolwindow.system.type.components.TSTreePanel
import com.intellij.openapi.Disposable
import com.intellij.openapi.actionSystem.ActionManager
@@ -52,14 +55,8 @@ class TSView(val myProject: Project) : SimpleToolWindowPanel(false, true), Dispo
setContent(panel)
}
- DumbService.getInstance(myProject).runWhenSmart {
- setContent(myTreePane);
-
- Disposer.register(this, myTreePane)
- myTreePane.update(TSViewSettings.ChangeType.FULL)
-
- installSettingsListener()
- }
+ Disposer.register(this, myTreePane)
+ installSettingsListener()
}
private fun installToolbar() {
@@ -77,6 +74,15 @@ class TSView(val myProject: Project) : SimpleToolWindowPanel(false, true), Dispo
myTreePane.update(changeType)
}
})
+ myProject.messageBus.connect(this).subscribe(TSMetaModelAccessImpl.topic, object : TSChangeListener {
+ override fun typeSystemChanged(globalMetaModel: TSGlobalMetaModel) {
+ myTreePane.update(TSViewSettings.ChangeType.FULL)
+
+ if (content != myTreePane) {
+ setContent(myTreePane)
+ }
+ }
+ })
}
private fun initItemsViewActionGroup(): DefaultActionGroup = with(