From 9b093250763519d4a433f10c25675635f07731a0 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 2 Jun 2014 19:03:01 +0400 Subject: [PATCH] moved to psi, register more services --- .../analysis/XmlErrorQuickFixProvider.java | 2 +- .../impl/analysis/XmlNsPrefixAnnotator.java | 2 +- .../lang/xml/XMLExternalAnnotator.java | 2 +- .../XmlReadWriteAccessDetector.java | 2 +- .../html/impl/util/MicrodataUtil.java | 2 +- .../com/intellij/lang/xml/XmlCommenter.java | 2 +- .../intellij/pom/xml/impl/XmlAspectImpl.java | 2 +- .../impl/events/XmlElementChangedImpl.java | 2 +- .../impl/events/XmlTagChildChangedImpl.java | 2 +- .../impl/events/XmlTagChildRemovedImpl.java | 2 +- .../intellij/psi/XmlElementFactoryImpl.java | 7 +++--- .../psi/filters/TextContainFilter.java | 2 +- .../intellij/psi/filters/TextStartFilter.java | 2 +- .../psi/filters/position/RootTagFilter.java | 2 +- .../cache/impl/idCache/XHtmlFilterLexer.java | 5 ++-- .../cache/impl/idCache/XHtmlIdIndexer.java | 2 +- .../cache/impl/idCache/XHtmlTodoIndexer.java | 2 +- .../cache/impl/idCache/XmlTodoIndexer.java | 2 +- .../TemplateHtmlScriptContentProvider.java | 15 +++++++++++ .../manipulators/XmlAttributeManipulator.java | 0 .../XmlAttributeValueManipulator.java | 0 .../XmlProcessingInstructionManipulator.java | 0 .../impl/manipulators/XmlTagManipulator.java | 0 .../impl/manipulators/XmlTextManipulator.java | 0 .../manipulators/XmlTokenManipulator.java | 0 .../impl/providers/DependentNSReference.java | 15 +++++++++++ .../impl/providers/URIReferenceProvider.java | 2 +- .../impl/providers/XmlValueReference.java | 2 +- .../xml/behavior/EncodeEachSymbolPolicy.java | 2 +- .../xml/XmlChangeLocalityDetector.java | 2 +- .../com/intellij/xml/XmlCoreEnvironment.java | 25 ++++++++++++++++++- .../src/com/intellij/xml/XmlPsiManager.java | 2 +- .../intellij/xml/index/SchemaTypeInfo.java | 2 +- .../xml/index/SchemaTypeInheritanceIndex.java | 4 +-- .../intellij/xml/index/XmlTagNamesIndex.java | 0 .../xml/index/XsdComplexTypeInfoBuilder.java | 2 +- .../intellij/xml/index/XsdTagNameBuilder.java | 2 +- .../com/intellij/xml/util/ColorIconCache.java | 2 +- .../xml/util/HtmlFileNSInfoProvider.java | 2 +- .../intellij/xml/util/XmlIconProvider.java | 2 +- .../xml/util/XmlPrefixReferenceProvider.java | 15 +++++++++++ 41 files changed, 103 insertions(+), 37 deletions(-) rename xml/{impl => xml-analysis-impl}/src/com/intellij/codeInsight/daemon/impl/analysis/XmlErrorQuickFixProvider.java (98%) rename xml/{impl => xml-analysis-impl}/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNsPrefixAnnotator.java (97%) rename xml/{impl => xml-analysis-impl}/src/com/intellij/lang/xml/XMLExternalAnnotator.java (99%) rename xml/{impl => xml-psi-impl}/src/com/intellij/codeInsight/highlighting/XmlReadWriteAccessDetector.java (98%) rename xml/{impl => xml-psi-impl}/src/com/intellij/html/impl/util/MicrodataUtil.java (99%) rename xml/{impl => xml-psi-impl}/src/com/intellij/lang/xml/XmlCommenter.java (96%) rename xml/{impl => xml-psi-impl}/src/com/intellij/pom/xml/impl/XmlAspectImpl.java (99%) rename xml/{impl => xml-psi-impl}/src/com/intellij/pom/xml/impl/events/XmlElementChangedImpl.java (96%) rename xml/{impl => xml-psi-impl}/src/com/intellij/pom/xml/impl/events/XmlTagChildChangedImpl.java (98%) rename xml/{impl => xml-psi-impl}/src/com/intellij/pom/xml/impl/events/XmlTagChildRemovedImpl.java (96%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/XmlElementFactoryImpl.java (95%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/filters/TextContainFilter.java (97%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/filters/TextStartFilter.java (97%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/filters/position/RootTagFilter.java (97%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlFilterLexer.java (96%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlIdIndexer.java (96%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlTodoIndexer.java (96%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/impl/cache/impl/idCache/XmlTodoIndexer.java (96%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/impl/source/html/TemplateHtmlScriptContentProvider.java (54%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeManipulator.java (100%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeValueManipulator.java (100%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlProcessingInstructionManipulator.java (100%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTagManipulator.java (100%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTextManipulator.java (100%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTokenManipulator.java (100%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DependentNSReference.java (71%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java (99%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/XmlValueReference.java (97%) rename xml/{impl => xml-psi-impl}/src/com/intellij/psi/impl/source/xml/behavior/EncodeEachSymbolPolicy.java (98%) rename xml/{impl => xml-psi-impl}/src/com/intellij/xml/XmlChangeLocalityDetector.java (97%) rename xml/{impl => xml-psi-impl}/src/com/intellij/xml/XmlPsiManager.java (97%) rename xml/{impl => xml-psi-impl}/src/com/intellij/xml/index/SchemaTypeInfo.java (98%) rename xml/{impl => xml-psi-impl}/src/com/intellij/xml/index/SchemaTypeInheritanceIndex.java (98%) rename xml/{impl => xml-psi-impl}/src/com/intellij/xml/index/XmlTagNamesIndex.java (100%) rename xml/{impl => xml-psi-impl}/src/com/intellij/xml/index/XsdComplexTypeInfoBuilder.java (99%) rename xml/{impl => xml-psi-impl}/src/com/intellij/xml/index/XsdTagNameBuilder.java (98%) rename xml/{impl => xml-psi-impl}/src/com/intellij/xml/util/ColorIconCache.java (98%) rename xml/{impl => xml-psi-impl}/src/com/intellij/xml/util/HtmlFileNSInfoProvider.java (96%) rename xml/{impl => xml-psi-impl}/src/com/intellij/xml/util/XmlIconProvider.java (97%) rename xml/{impl => xml-psi-impl}/src/com/intellij/xml/util/XmlPrefixReferenceProvider.java (77%) diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlErrorQuickFixProvider.java b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlErrorQuickFixProvider.java similarity index 98% rename from xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlErrorQuickFixProvider.java rename to xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlErrorQuickFixProvider.java index 44a6db798ba4..9f3b33daf6db 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlErrorQuickFixProvider.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlErrorQuickFixProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNsPrefixAnnotator.java b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNsPrefixAnnotator.java similarity index 97% rename from xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNsPrefixAnnotator.java rename to xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNsPrefixAnnotator.java index eacbd5c78c73..c9e83b4bfee8 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNsPrefixAnnotator.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNsPrefixAnnotator.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/lang/xml/XMLExternalAnnotator.java b/xml/xml-analysis-impl/src/com/intellij/lang/xml/XMLExternalAnnotator.java similarity index 99% rename from xml/impl/src/com/intellij/lang/xml/XMLExternalAnnotator.java rename to xml/xml-analysis-impl/src/com/intellij/lang/xml/XMLExternalAnnotator.java index 599ed5dc44a0..82731a089443 100644 --- a/xml/impl/src/com/intellij/lang/xml/XMLExternalAnnotator.java +++ b/xml/xml-analysis-impl/src/com/intellij/lang/xml/XMLExternalAnnotator.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/codeInsight/highlighting/XmlReadWriteAccessDetector.java b/xml/xml-psi-impl/src/com/intellij/codeInsight/highlighting/XmlReadWriteAccessDetector.java similarity index 98% rename from xml/impl/src/com/intellij/codeInsight/highlighting/XmlReadWriteAccessDetector.java rename to xml/xml-psi-impl/src/com/intellij/codeInsight/highlighting/XmlReadWriteAccessDetector.java index 1a12263492ed..4a1d91804b7d 100644 --- a/xml/impl/src/com/intellij/codeInsight/highlighting/XmlReadWriteAccessDetector.java +++ b/xml/xml-psi-impl/src/com/intellij/codeInsight/highlighting/XmlReadWriteAccessDetector.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/html/impl/util/MicrodataUtil.java b/xml/xml-psi-impl/src/com/intellij/html/impl/util/MicrodataUtil.java similarity index 99% rename from xml/impl/src/com/intellij/html/impl/util/MicrodataUtil.java rename to xml/xml-psi-impl/src/com/intellij/html/impl/util/MicrodataUtil.java index 5374558370c6..bfdcca25f294 100644 --- a/xml/impl/src/com/intellij/html/impl/util/MicrodataUtil.java +++ b/xml/xml-psi-impl/src/com/intellij/html/impl/util/MicrodataUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/lang/xml/XmlCommenter.java b/xml/xml-psi-impl/src/com/intellij/lang/xml/XmlCommenter.java similarity index 96% rename from xml/impl/src/com/intellij/lang/xml/XmlCommenter.java rename to xml/xml-psi-impl/src/com/intellij/lang/xml/XmlCommenter.java index 470103694cbc..0e024cf088c6 100644 --- a/xml/impl/src/com/intellij/lang/xml/XmlCommenter.java +++ b/xml/xml-psi-impl/src/com/intellij/lang/xml/XmlCommenter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/pom/xml/impl/XmlAspectImpl.java b/xml/xml-psi-impl/src/com/intellij/pom/xml/impl/XmlAspectImpl.java similarity index 99% rename from xml/impl/src/com/intellij/pom/xml/impl/XmlAspectImpl.java rename to xml/xml-psi-impl/src/com/intellij/pom/xml/impl/XmlAspectImpl.java index db7580206072..bc4acf707df1 100644 --- a/xml/impl/src/com/intellij/pom/xml/impl/XmlAspectImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/pom/xml/impl/XmlAspectImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlElementChangedImpl.java b/xml/xml-psi-impl/src/com/intellij/pom/xml/impl/events/XmlElementChangedImpl.java similarity index 96% rename from xml/impl/src/com/intellij/pom/xml/impl/events/XmlElementChangedImpl.java rename to xml/xml-psi-impl/src/com/intellij/pom/xml/impl/events/XmlElementChangedImpl.java index 6c694ac7b365..0c7ad00ca850 100644 --- a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlElementChangedImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/pom/xml/impl/events/XmlElementChangedImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildChangedImpl.java b/xml/xml-psi-impl/src/com/intellij/pom/xml/impl/events/XmlTagChildChangedImpl.java similarity index 98% rename from xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildChangedImpl.java rename to xml/xml-psi-impl/src/com/intellij/pom/xml/impl/events/XmlTagChildChangedImpl.java index 0550fcd24232..45b122b9223f 100644 --- a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildChangedImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/pom/xml/impl/events/XmlTagChildChangedImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildRemovedImpl.java b/xml/xml-psi-impl/src/com/intellij/pom/xml/impl/events/XmlTagChildRemovedImpl.java similarity index 96% rename from xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildRemovedImpl.java rename to xml/xml-psi-impl/src/com/intellij/pom/xml/impl/events/XmlTagChildRemovedImpl.java index 63e9336059eb..d3eca89e2f30 100644 --- a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildRemovedImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/pom/xml/impl/events/XmlTagChildRemovedImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/psi/XmlElementFactoryImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/XmlElementFactoryImpl.java similarity index 95% rename from xml/impl/src/com/intellij/psi/XmlElementFactoryImpl.java rename to xml/xml-psi-impl/src/com/intellij/psi/XmlElementFactoryImpl.java index 4f354001bcf7..6f40f853b777 100644 --- a/xml/impl/src/com/intellij/psi/XmlElementFactoryImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/XmlElementFactoryImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -23,7 +23,6 @@ import com.intellij.lang.Language; import com.intellij.lang.xml.XMLLanguage; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileTypes.FileType; -import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.xml.*; @@ -48,7 +47,7 @@ public class XmlElementFactoryImpl extends XmlElementFactory { public XmlTag createTagFromText(@NotNull @NonNls CharSequence text, @NotNull Language language) throws IncorrectOperationException { assert language instanceof XMLLanguage:"Tag can be created only for xml language"; FileType type = language.getAssociatedFileType(); - if (type == null) type = StdFileTypes.XML; + if (type == null) type = XmlFileType.INSTANCE; final XmlDocument document = createXmlDocument(text, "dummy."+ type.getDefaultExtension(), type); final XmlTag tag = document.getRootTag(); if (tag == null) throw new IncorrectOperationException("Incorrect tag text"); @@ -58,7 +57,7 @@ public class XmlElementFactoryImpl extends XmlElementFactory { @Override @NotNull public XmlTag createTagFromText(@NotNull CharSequence text) throws IncorrectOperationException { - return createTagFromText(text, StdFileTypes.XML.getLanguage()); + return createTagFromText(text, XMLLanguage.INSTANCE); } @Override diff --git a/xml/impl/src/com/intellij/psi/filters/TextContainFilter.java b/xml/xml-psi-impl/src/com/intellij/psi/filters/TextContainFilter.java similarity index 97% rename from xml/impl/src/com/intellij/psi/filters/TextContainFilter.java rename to xml/xml-psi-impl/src/com/intellij/psi/filters/TextContainFilter.java index 0a7ce9e6cba0..126fbc294da6 100644 --- a/xml/impl/src/com/intellij/psi/filters/TextContainFilter.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/filters/TextContainFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/psi/filters/TextStartFilter.java b/xml/xml-psi-impl/src/com/intellij/psi/filters/TextStartFilter.java similarity index 97% rename from xml/impl/src/com/intellij/psi/filters/TextStartFilter.java rename to xml/xml-psi-impl/src/com/intellij/psi/filters/TextStartFilter.java index f11d80663377..579ab9788d3c 100644 --- a/xml/impl/src/com/intellij/psi/filters/TextStartFilter.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/filters/TextStartFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/psi/filters/position/RootTagFilter.java b/xml/xml-psi-impl/src/com/intellij/psi/filters/position/RootTagFilter.java similarity index 97% rename from xml/impl/src/com/intellij/psi/filters/position/RootTagFilter.java rename to xml/xml-psi-impl/src/com/intellij/psi/filters/position/RootTagFilter.java index ea39b3fa2dbb..c1b649e2e0a5 100644 --- a/xml/impl/src/com/intellij/psi/filters/position/RootTagFilter.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/filters/position/RootTagFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlFilterLexer.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlFilterLexer.java similarity index 96% rename from xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlFilterLexer.java rename to xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlFilterLexer.java index 0fe0ed599b7b..f1c6a74dfa6e 100644 --- a/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlFilterLexer.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlFilterLexer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -18,12 +18,11 @@ package com.intellij.psi.impl.cache.impl.idCache; import com.intellij.lang.Language; import com.intellij.lang.xml.XMLLanguage; import com.intellij.lexer.Lexer; -import com.intellij.psi.impl.cache.impl.BaseFilterLexer; import com.intellij.psi.impl.cache.CacheUtil; +import com.intellij.psi.impl.cache.impl.BaseFilterLexer; import com.intellij.psi.impl.cache.impl.OccurrenceConsumer; import com.intellij.psi.search.UsageSearchContext; import com.intellij.psi.tree.IElementType; -import com.intellij.psi.xml.XmlElementType; import com.intellij.psi.xml.XmlTokenType; public class XHtmlFilterLexer extends BaseFilterLexer { diff --git a/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlIdIndexer.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlIdIndexer.java similarity index 96% rename from xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlIdIndexer.java rename to xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlIdIndexer.java index 4ae3e8306b92..da108c56eb58 100644 --- a/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlIdIndexer.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlIdIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlTodoIndexer.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlTodoIndexer.java similarity index 96% rename from xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlTodoIndexer.java rename to xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlTodoIndexer.java index bd3458f6d88c..a445d1a3a4e3 100644 --- a/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlTodoIndexer.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlTodoIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlTodoIndexer.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlTodoIndexer.java similarity index 96% rename from xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlTodoIndexer.java rename to xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlTodoIndexer.java index 4847f3d32ea8..bd6537876594 100644 --- a/xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlTodoIndexer.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlTodoIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/psi/impl/source/html/TemplateHtmlScriptContentProvider.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/TemplateHtmlScriptContentProvider.java similarity index 54% rename from xml/impl/src/com/intellij/psi/impl/source/html/TemplateHtmlScriptContentProvider.java rename to xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/TemplateHtmlScriptContentProvider.java index 8f4e49203482..203ee7ee178e 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/html/TemplateHtmlScriptContentProvider.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/TemplateHtmlScriptContentProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2014 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.psi.impl.source.html; import com.intellij.ide.highlighter.HtmlFileType; diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeManipulator.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeManipulator.java similarity index 100% rename from xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeManipulator.java rename to xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeManipulator.java diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeValueManipulator.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeValueManipulator.java similarity index 100% rename from xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeValueManipulator.java rename to xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeValueManipulator.java diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlProcessingInstructionManipulator.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlProcessingInstructionManipulator.java similarity index 100% rename from xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlProcessingInstructionManipulator.java rename to xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlProcessingInstructionManipulator.java diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTagManipulator.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTagManipulator.java similarity index 100% rename from xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTagManipulator.java rename to xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTagManipulator.java diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTextManipulator.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTextManipulator.java similarity index 100% rename from xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTextManipulator.java rename to xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTextManipulator.java diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTokenManipulator.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTokenManipulator.java similarity index 100% rename from xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTokenManipulator.java rename to xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTokenManipulator.java diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DependentNSReference.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DependentNSReference.java similarity index 71% rename from xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DependentNSReference.java rename to xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DependentNSReference.java index feeb5bc890c1..9a33ba714c99 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DependentNSReference.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DependentNSReference.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2014 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.psi.impl.source.resolve.reference.impl.providers; import com.intellij.javaee.ExternalResourceManager; diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java similarity index 99% rename from xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java rename to xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java index a86d7598cdde..03540628cd75 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/XmlValueReference.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/XmlValueReference.java similarity index 97% rename from xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/XmlValueReference.java rename to xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/XmlValueReference.java index 9bccd2589707..1499918562e0 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/XmlValueReference.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/XmlValueReference.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/behavior/EncodeEachSymbolPolicy.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/behavior/EncodeEachSymbolPolicy.java similarity index 98% rename from xml/impl/src/com/intellij/psi/impl/source/xml/behavior/EncodeEachSymbolPolicy.java rename to xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/behavior/EncodeEachSymbolPolicy.java index 64e9b28e39a7..9e0945adf994 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/behavior/EncodeEachSymbolPolicy.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/behavior/EncodeEachSymbolPolicy.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/xml/XmlChangeLocalityDetector.java b/xml/xml-psi-impl/src/com/intellij/xml/XmlChangeLocalityDetector.java similarity index 97% rename from xml/impl/src/com/intellij/xml/XmlChangeLocalityDetector.java rename to xml/xml-psi-impl/src/com/intellij/xml/XmlChangeLocalityDetector.java index fb65aa55965d..db3bba7f1ed1 100644 --- a/xml/impl/src/com/intellij/xml/XmlChangeLocalityDetector.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/XmlChangeLocalityDetector.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/xml-psi-impl/src/com/intellij/xml/XmlCoreEnvironment.java b/xml/xml-psi-impl/src/com/intellij/xml/XmlCoreEnvironment.java index b69200aa5a56..266a0e6bbac2 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/XmlCoreEnvironment.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/XmlCoreEnvironment.java @@ -17,6 +17,8 @@ package com.intellij.xml; import com.intellij.application.options.PathMacrosImpl; import com.intellij.application.options.editor.XmlFoldingSettings; +import com.intellij.codeInsight.highlighting.ReadWriteAccessDetector; +import com.intellij.codeInsight.highlighting.XmlReadWriteAccessDetector; import com.intellij.codeInspection.XmlSuppressionProvider; import com.intellij.core.CoreApplicationEnvironment; import com.intellij.core.CoreProjectEnvironment; @@ -44,14 +46,22 @@ import com.intellij.lexer.HtmlEmbeddedTokenTypesProvider; import com.intellij.openapi.application.PathMacros; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory; +import com.intellij.psi.XmlElementFactory; +import com.intellij.psi.XmlElementFactoryImpl; import com.intellij.psi.impl.cache.impl.id.IdIndexers; +import com.intellij.psi.impl.cache.impl.idCache.XHtmlTodoIndexer; import com.intellij.psi.impl.cache.impl.idCache.XmlIdIndexer; +import com.intellij.psi.impl.cache.impl.idCache.XmlTodoIndexer; +import com.intellij.psi.impl.cache.impl.todo.TodoIndexers; import com.intellij.psi.impl.source.xml.XmlElementDescriptorProvider; import com.intellij.psi.meta.MetaDataContributor; import com.intellij.psi.xml.StartTagEndTokenProvider; import com.intellij.psi.xml.XmlFileNSInfoProvider; import com.intellij.util.indexing.FileBasedIndexExtension; +import com.intellij.xml.index.SchemaTypeInheritanceIndex; import com.intellij.xml.index.XmlNamespaceIndex; +import com.intellij.xml.index.XmlTagNamesIndex; +import com.intellij.xml.util.HtmlFileNSInfoProvider; import com.intellij.xml.util.XmlApplicationComponent; /** @@ -79,10 +89,20 @@ public class XmlCoreEnvironment { appEnvironment.addExplicitExtension(IdIndexers.INSTANCE, XmlFileType.INSTANCE, new XmlIdIndexer()); appEnvironment.addExplicitExtension(IdIndexers.INSTANCE, DTDFileType.INSTANCE, new XmlIdIndexer()); + appEnvironment.addExplicitExtension(TodoIndexers.INSTANCE, XmlFileType.INSTANCE, new XmlTodoIndexer()); + appEnvironment.addExplicitExtension(TodoIndexers.INSTANCE, DTDFileType.INSTANCE, new XmlTodoIndexer()); + appEnvironment.addExplicitExtension(TodoIndexers.INSTANCE, XHtmlFileType.INSTANCE, new XHtmlTodoIndexer()); + + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), ReadWriteAccessDetector.EP_NAME, + ReadWriteAccessDetector.class); + appEnvironment.addExtension(ReadWriteAccessDetector.EP_NAME, new XmlReadWriteAccessDetector()); + + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), XmlFileNSInfoProvider.EP_NAME, XmlFileNSInfoProvider.class); + appEnvironment.addExtension(XmlFileNSInfoProvider.EP_NAME, new HtmlFileNSInfoProvider()); + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), StartTagEndTokenProvider.EP_NAME, StartTagEndTokenProvider.class); CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), XmlSuppressionProvider.EP_NAME, XmlSuppressionProvider.class); - CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), XmlFileNSInfoProvider.EP_NAME, XmlFileNSInfoProvider.class); CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), XmlSchemaProvider.EP_NAME, XmlSchemaProvider.class); CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), ImplicitNamespaceDescriptorProvider.EP_NAME, ImplicitNamespaceDescriptorProvider.class); CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), XmlElementDescriptorProvider.EP_NAME, XmlElementDescriptorProvider.class); @@ -95,6 +115,8 @@ public class XmlCoreEnvironment { appEnvironment.addExtension(MetaDataContributor.EP_NAME, new XmlApplicationComponent()); appEnvironment.addExtension(FileBasedIndexExtension.EXTENSION_POINT_NAME, new XmlNamespaceIndex()); + appEnvironment.addExtension(FileBasedIndexExtension.EXTENSION_POINT_NAME, new SchemaTypeInheritanceIndex()); + appEnvironment.addExtension(FileBasedIndexExtension.EXTENSION_POINT_NAME, new XmlTagNamesIndex()); appEnvironment.addExtension(StandardResourceProvider.EP_NAME, new InternalResourceProvider()); appEnvironment.registerApplicationComponent(PathMacros.class, new PathMacrosImpl()); @@ -115,6 +137,7 @@ public class XmlCoreEnvironment { public static class ProjectEnvironment { public ProjectEnvironment(CoreProjectEnvironment projectEnvironment) { + projectEnvironment.getProject().registerService(XmlElementFactory.class, new XmlElementFactoryImpl(projectEnvironment.getProject())); } } } diff --git a/xml/impl/src/com/intellij/xml/XmlPsiManager.java b/xml/xml-psi-impl/src/com/intellij/xml/XmlPsiManager.java similarity index 97% rename from xml/impl/src/com/intellij/xml/XmlPsiManager.java rename to xml/xml-psi-impl/src/com/intellij/xml/XmlPsiManager.java index 8492313042f3..3525a00163a7 100644 --- a/xml/impl/src/com/intellij/xml/XmlPsiManager.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/XmlPsiManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/xml/index/SchemaTypeInfo.java b/xml/xml-psi-impl/src/com/intellij/xml/index/SchemaTypeInfo.java similarity index 98% rename from xml/impl/src/com/intellij/xml/index/SchemaTypeInfo.java rename to xml/xml-psi-impl/src/com/intellij/xml/index/SchemaTypeInfo.java index 9d857a0af9cd..0760587559a7 100644 --- a/xml/impl/src/com/intellij/xml/index/SchemaTypeInfo.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/index/SchemaTypeInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/xml/index/SchemaTypeInheritanceIndex.java b/xml/xml-psi-impl/src/com/intellij/xml/index/SchemaTypeInheritanceIndex.java similarity index 98% rename from xml/impl/src/com/intellij/xml/index/SchemaTypeInheritanceIndex.java rename to xml/xml-psi-impl/src/com/intellij/xml/index/SchemaTypeInheritanceIndex.java index fb74cd1ccf11..fb9005d6ffdb 100644 --- a/xml/impl/src/com/intellij/xml/index/SchemaTypeInheritanceIndex.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/index/SchemaTypeInheritanceIndex.java @@ -18,7 +18,7 @@ package com.intellij.xml.index; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; -import com.intellij.openapi.vfs.VfsUtil; +import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.util.PairConvertor; @@ -87,7 +87,7 @@ public class SchemaTypeInheritanceIndex extends XmlIndex> { if (myShouldParseCurrent) { if (myMap == null) { try { - myMap = XsdComplexTypeInfoBuilder.parse(CharArrayUtil.readerFromCharSequence(VfsUtil.loadText(myCurrentFile))); + myMap = XsdComplexTypeInfoBuilder.parse(CharArrayUtil.readerFromCharSequence(VfsUtilCore.loadText(myCurrentFile))); type.add(new HashSet(myMap.get(new SchemaTypeInfo(name, true, ns)))); } catch (IOException e) { diff --git a/xml/impl/src/com/intellij/xml/index/XmlTagNamesIndex.java b/xml/xml-psi-impl/src/com/intellij/xml/index/XmlTagNamesIndex.java similarity index 100% rename from xml/impl/src/com/intellij/xml/index/XmlTagNamesIndex.java rename to xml/xml-psi-impl/src/com/intellij/xml/index/XmlTagNamesIndex.java diff --git a/xml/impl/src/com/intellij/xml/index/XsdComplexTypeInfoBuilder.java b/xml/xml-psi-impl/src/com/intellij/xml/index/XsdComplexTypeInfoBuilder.java similarity index 99% rename from xml/impl/src/com/intellij/xml/index/XsdComplexTypeInfoBuilder.java rename to xml/xml-psi-impl/src/com/intellij/xml/index/XsdComplexTypeInfoBuilder.java index 75b8dd36f507..21bc1c99279c 100644 --- a/xml/impl/src/com/intellij/xml/index/XsdComplexTypeInfoBuilder.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/index/XsdComplexTypeInfoBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/xml/index/XsdTagNameBuilder.java b/xml/xml-psi-impl/src/com/intellij/xml/index/XsdTagNameBuilder.java similarity index 98% rename from xml/impl/src/com/intellij/xml/index/XsdTagNameBuilder.java rename to xml/xml-psi-impl/src/com/intellij/xml/index/XsdTagNameBuilder.java index 1754fbdffbd1..3cf725a61298 100644 --- a/xml/impl/src/com/intellij/xml/index/XsdTagNameBuilder.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/index/XsdTagNameBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/xml/util/ColorIconCache.java b/xml/xml-psi-impl/src/com/intellij/xml/util/ColorIconCache.java similarity index 98% rename from xml/impl/src/com/intellij/xml/util/ColorIconCache.java rename to xml/xml-psi-impl/src/com/intellij/xml/util/ColorIconCache.java index c0f01ad354eb..ae347b0320d1 100644 --- a/xml/impl/src/com/intellij/xml/util/ColorIconCache.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/util/ColorIconCache.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2010 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/xml/util/HtmlFileNSInfoProvider.java b/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlFileNSInfoProvider.java similarity index 96% rename from xml/impl/src/com/intellij/xml/util/HtmlFileNSInfoProvider.java rename to xml/xml-psi-impl/src/com/intellij/xml/util/HtmlFileNSInfoProvider.java index e9da0571db5d..ce6b02ab2032 100644 --- a/xml/impl/src/com/intellij/xml/util/HtmlFileNSInfoProvider.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlFileNSInfoProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/xml/util/XmlIconProvider.java b/xml/xml-psi-impl/src/com/intellij/xml/util/XmlIconProvider.java similarity index 97% rename from xml/impl/src/com/intellij/xml/util/XmlIconProvider.java rename to xml/xml-psi-impl/src/com/intellij/xml/util/XmlIconProvider.java index e12801d050f7..630cde1d658c 100644 --- a/xml/impl/src/com/intellij/xml/util/XmlIconProvider.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/util/XmlIconProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. diff --git a/xml/impl/src/com/intellij/xml/util/XmlPrefixReferenceProvider.java b/xml/xml-psi-impl/src/com/intellij/xml/util/XmlPrefixReferenceProvider.java similarity index 77% rename from xml/impl/src/com/intellij/xml/util/XmlPrefixReferenceProvider.java rename to xml/xml-psi-impl/src/com/intellij/xml/util/XmlPrefixReferenceProvider.java index a740db03aba0..2af1bfecf812 100644 --- a/xml/impl/src/com/intellij/xml/util/XmlPrefixReferenceProvider.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/util/XmlPrefixReferenceProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2014 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.xml.util; import com.intellij.openapi.util.TextRange;