From 2338173c5c1365b2d3a2e03ca8c46dfb3cc6aa61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Wed, 19 Aug 2015 17:52:57 +0200 Subject: [PATCH] [devkit] DOM: fix @Stubbed for Extensions --- plugins/devkit/src/dom/IdeaPlugin.java | 3 ++- .../devkit/src/dom/impl/PluginXmlDomFileDescription.java | 4 ++-- .../devkit/testData/pluginXmlDomStubs/pluginXmlStubs.xml | 2 ++ .../testSources/codeInsight/PluginXmlDomStubsTest.java | 7 +++++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/plugins/devkit/src/dom/IdeaPlugin.java b/plugins/devkit/src/dom/IdeaPlugin.java index d1d3c355f93f..0be5e9853988 100644 --- a/plugins/devkit/src/dom/IdeaPlugin.java +++ b/plugins/devkit/src/dom/IdeaPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -105,6 +105,7 @@ public interface IdeaPlugin extends DomElement { @NotNull @SubTagList("extensions") + @Stubbed List getExtensions(); Extensions addExtensions(); diff --git a/plugins/devkit/src/dom/impl/PluginXmlDomFileDescription.java b/plugins/devkit/src/dom/impl/PluginXmlDomFileDescription.java index 091c172d0a60..d55248376888 100644 --- a/plugins/devkit/src/dom/impl/PluginXmlDomFileDescription.java +++ b/plugins/devkit/src/dom/impl/PluginXmlDomFileDescription.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,6 +43,6 @@ public class PluginXmlDomFileDescription extends DomFileDescription @Override public int getStubVersion() { - return 3; + return 4; } } diff --git a/plugins/devkit/testData/pluginXmlDomStubs/pluginXmlStubs.xml b/plugins/devkit/testData/pluginXmlDomStubs/pluginXmlStubs.xml index 30e95aa28cd1..d05f6d47ff4a 100644 --- a/plugins/devkit/testData/pluginXmlDomStubs/pluginXmlStubs.xml +++ b/plugins/devkit/testData/pluginXmlDomStubs/pluginXmlStubs.xml @@ -13,4 +13,6 @@ + + \ No newline at end of file diff --git a/plugins/devkit/testSources/codeInsight/PluginXmlDomStubsTest.java b/plugins/devkit/testSources/codeInsight/PluginXmlDomStubsTest.java index f920bfb0e374..ecea03a9c204 100644 --- a/plugins/devkit/testSources/codeInsight/PluginXmlDomStubsTest.java +++ b/plugins/devkit/testSources/codeInsight/PluginXmlDomStubsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +40,10 @@ public class PluginXmlDomStubsTest extends DomStubTest { " Attribute:implements:SomeImplements\n" + " Element:extensionPoint\n" + " Attribute:qualifiedName:qualifiedName\n" + - " Attribute:beanClass:BeanClass\n"); + " Attribute:beanClass:BeanClass\n" + + " Element:extensions\n" + + " Attribute:defaultExtensionNs:defaultExtensionNs\n" + + " Attribute:xmlns:extensionXmlNs\n"); } public void testXInclude() throws Exception {