From 767d1a50e6eb63817b307bf3c6b2cc7fd8973e4e Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 18 Feb 2020 09:37:06 +0300 Subject: [PATCH] [xml] move property used in xml.structureView module from XmlBundle to XmlPsiBundle This is needed to allow moving XmlBundle to intellij.xml module (IDEA-209382), it seems that it isn't worth introducing XmlStructureViewBundle for a single property. GitOrigin-RevId: 0215097011fd066a0b5d3af7cf7f68dffb1efad1 --- .../platform-resources-en/src/messages/XmlBundle.properties | 2 -- xml/xml-psi-api/resources/messages/XmlPsiBundle.properties | 1 + .../lang/html/structureView/Html5SectionsNodeProvider.java | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/platform/platform-resources-en/src/messages/XmlBundle.properties b/platform/platform-resources-en/src/messages/XmlBundle.properties index 997b9add6950..e8cd26913536 100644 --- a/platform/platform-resources-en/src/messages/XmlBundle.properties +++ b/platform/platform-resources-en/src/messages/XmlBundle.properties @@ -192,8 +192,6 @@ title.cannot.create.html.file=Cannot create HTML file new.html.file.action=HTML File new.html.file.action.dialog.title=New HTML File new.html.file.action.description=Creates new HTML file -html5.outline.mode=HTML5 Outline - start.browser.startup.page=Startup pa&ge: start.browser.border.label.open.browser=Open browser start.browser.checkbox.start.browser=After launch diff --git a/xml/xml-psi-api/resources/messages/XmlPsiBundle.properties b/xml/xml-psi-api/resources/messages/XmlPsiBundle.properties index c775e23b591e..20218f78ca57 100644 --- a/xml/xml-psi-api/resources/messages/XmlPsiBundle.properties +++ b/xml/xml-psi-api/resources/messages/XmlPsiBundle.properties @@ -14,6 +14,7 @@ filetype.description.html=HTML filetype.description.xhtml=XHTML filetype.description.xml=XML +html5.outline.mode=HTML5 Outline namespace.alias=namespace registered.resource.is.not.recognized=Resource registered by this uri is not recognized (Settings | Languages \\& Frameworks | Schemas and DTDs) should.have.fixed.value={0} should have fixed value {1} diff --git a/xml/xml-structure-view-impl/src/com/intellij/lang/html/structureView/Html5SectionsNodeProvider.java b/xml/xml-structure-view-impl/src/com/intellij/lang/html/structureView/Html5SectionsNodeProvider.java index 635882c58998..74c3614d8c5f 100644 --- a/xml/xml-structure-view-impl/src/com/intellij/lang/html/structureView/Html5SectionsNodeProvider.java +++ b/xml/xml-structure-view-impl/src/com/intellij/lang/html/structureView/Html5SectionsNodeProvider.java @@ -29,7 +29,7 @@ import com.intellij.psi.xml.XmlDocument; import com.intellij.psi.xml.XmlFile; import com.intellij.psi.xml.XmlTag; import com.intellij.util.IncorrectOperationException; -import com.intellij.xml.XmlBundle; +import com.intellij.xml.psi.XmlPsiBundle; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -52,13 +52,13 @@ public class Html5SectionsNodeProvider implements FileStructureNodeProvider