diff --git a/python/src/META-INF/python-core.xml b/python/src/META-INF/python-core.xml index 29489c86a618..9a1cb3e3fb1e 100644 --- a/python/src/META-INF/python-core.xml +++ b/python/src/META-INF/python-core.xml @@ -479,8 +479,8 @@ - - + + myResult; diff --git a/python/src/com/jetbrains/python/documentation/PyDocumentationSettings.java b/python/src/com/jetbrains/python/documentation/PyDocumentationSettings.java index 248aa6c5f737..26969482f8da 100644 --- a/python/src/com/jetbrains/python/documentation/PyDocumentationSettings.java +++ b/python/src/com/jetbrains/python/documentation/PyDocumentationSettings.java @@ -27,6 +27,7 @@ import com.intellij.util.xmlb.XmlSerializerUtil; import com.intellij.util.xmlb.annotations.OptionTag; import com.intellij.util.xmlb.annotations.Transient; import com.jetbrains.python.PyNames; +import com.jetbrains.python.documentation.docstrings.DocStringFormat; import com.jetbrains.python.psi.PyFile; import com.jetbrains.python.psi.PyTargetExpression; import com.jetbrains.python.psi.impl.PyPsiUtils; diff --git a/python/src/com/jetbrains/python/documentation/PythonDocumentationProvider.java b/python/src/com/jetbrains/python/documentation/PythonDocumentationProvider.java index ae6d3a1f862b..c5e17bb0613b 100644 --- a/python/src/com/jetbrains/python/documentation/PythonDocumentationProvider.java +++ b/python/src/com/jetbrains/python/documentation/PythonDocumentationProvider.java @@ -36,6 +36,7 @@ import com.intellij.util.Function; import com.jetbrains.python.PyNames; import com.jetbrains.python.console.PydevConsoleRunner; import com.jetbrains.python.console.PydevDocumentationProvider; +import com.jetbrains.python.documentation.docstrings.DocStringUtil; import com.jetbrains.python.psi.*; import com.jetbrains.python.psi.impl.PyBuiltinCache; import com.jetbrains.python.psi.resolve.QualifiedNameFinder; diff --git a/python/src/com/jetbrains/python/documentation/DocStringFormat.java b/python/src/com/jetbrains/python/documentation/docstrings/DocStringFormat.java similarity index 97% rename from python/src/com/jetbrains/python/documentation/DocStringFormat.java rename to python/src/com/jetbrains/python/documentation/docstrings/DocStringFormat.java index 99f884aca36f..35b4148ddba3 100644 --- a/python/src/com/jetbrains/python/documentation/DocStringFormat.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/DocStringFormat.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.jetbrains.python.documentation; +package com.jetbrains.python.documentation.docstrings; import com.intellij.psi.PsiElement; import com.intellij.util.Function; diff --git a/python/src/com/jetbrains/python/documentation/DocStringLineParser.java b/python/src/com/jetbrains/python/documentation/docstrings/DocStringLineParser.java similarity index 98% rename from python/src/com/jetbrains/python/documentation/DocStringLineParser.java rename to python/src/com/jetbrains/python/documentation/docstrings/DocStringLineParser.java index 21ea76a26b4d..baae1338dadd 100644 --- a/python/src/com/jetbrains/python/documentation/DocStringLineParser.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/DocStringLineParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.jetbrains.python.documentation; +package com.jetbrains.python.documentation.docstrings; import com.intellij.openapi.util.text.StringUtil; import com.jetbrains.python.psi.PyIndentUtil; diff --git a/python/src/com/jetbrains/python/documentation/DocStringParameterReference.java b/python/src/com/jetbrains/python/documentation/docstrings/DocStringParameterReference.java similarity index 99% rename from python/src/com/jetbrains/python/documentation/DocStringParameterReference.java rename to python/src/com/jetbrains/python/documentation/docstrings/DocStringParameterReference.java index 8b291c65d798..c16df248b0d8 100644 --- a/python/src/com/jetbrains/python/documentation/DocStringParameterReference.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/DocStringParameterReference.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.jetbrains.python.documentation; +package com.jetbrains.python.documentation.docstrings; import com.google.common.collect.Lists; import com.intellij.lang.annotation.HighlightSeverity; diff --git a/python/src/com/jetbrains/python/documentation/DocStringReferenceContributor.java b/python/src/com/jetbrains/python/documentation/docstrings/DocStringReferenceContributor.java similarity index 95% rename from python/src/com/jetbrains/python/documentation/DocStringReferenceContributor.java rename to python/src/com/jetbrains/python/documentation/docstrings/DocStringReferenceContributor.java index 192a70b8e8e8..1804d65e62e5 100644 --- a/python/src/com/jetbrains/python/documentation/DocStringReferenceContributor.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/DocStringReferenceContributor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.jetbrains.python.documentation; +package com.jetbrains.python.documentation.docstrings; import com.intellij.psi.PsiReferenceContributor; import com.intellij.psi.PsiReferenceRegistrar; diff --git a/python/src/com/jetbrains/python/documentation/DocStringReferenceProvider.java b/python/src/com/jetbrains/python/documentation/docstrings/DocStringReferenceProvider.java similarity index 87% rename from python/src/com/jetbrains/python/documentation/DocStringReferenceProvider.java rename to python/src/com/jetbrains/python/documentation/docstrings/DocStringReferenceProvider.java index 958d43da5f61..0baa707157c5 100644 --- a/python/src/com/jetbrains/python/documentation/DocStringReferenceProvider.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/DocStringReferenceProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.jetbrains.python.documentation; +package com.jetbrains.python.documentation.docstrings; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; @@ -22,8 +22,6 @@ import com.intellij.psi.PsiReferenceProvider; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.ProcessingContext; import com.jetbrains.python.PyNames; -import com.jetbrains.python.documentation.DocStringParameterReference.ReferenceType; -import com.jetbrains.python.documentation.SectionBasedDocString.SectionField; import com.jetbrains.python.psi.PyDocStringOwner; import com.jetbrains.python.psi.PyImportElement; import com.jetbrains.python.psi.PyStringLiteralExpression; @@ -64,29 +62,29 @@ public class DocStringReferenceProvider extends PsiReferenceProvider { final TagBasedDocString taggedDocString = (TagBasedDocString)docString; result.addAll(referencesFromNames(expr, offset, docString, taggedDocString.getTagArguments(TagBasedDocString.PARAM_TAGS), - ReferenceType.PARAMETER)); + DocStringParameterReference.ReferenceType.PARAMETER)); result.addAll(referencesFromNames(expr, offset, docString, taggedDocString.getTagArguments(TagBasedDocString.PARAM_TYPE_TAGS), - ReferenceType.PARAMETER_TYPE)); + DocStringParameterReference.ReferenceType.PARAMETER_TYPE)); result.addAll(referencesFromNames(expr, offset, docString, - docString.getKeywordArgumentSubstrings(), ReferenceType.KEYWORD)); + docString.getKeywordArgumentSubstrings(), DocStringParameterReference.ReferenceType.KEYWORD)); result.addAll(referencesFromNames(expr, offset, docString, taggedDocString.getTagArguments("var"), - ReferenceType.VARIABLE)); + DocStringParameterReference.ReferenceType.VARIABLE)); result.addAll(referencesFromNames(expr, offset, docString, taggedDocString.getTagArguments("cvar"), - ReferenceType.CLASS_VARIABLE)); + DocStringParameterReference.ReferenceType.CLASS_VARIABLE)); result.addAll(referencesFromNames(expr, offset, docString, taggedDocString.getTagArguments("ivar"), - ReferenceType.INSTANCE_VARIABLE)); + DocStringParameterReference.ReferenceType.INSTANCE_VARIABLE)); result.addAll(returnTypes(element, docString, offset)); } else if (docString instanceof SectionBasedDocString) { final SectionBasedDocString sectioned = (SectionBasedDocString)docString; - result.addAll(referencesFromFields(expr, offset, sectioned.getParameterFields(), ReferenceType.PARAMETER)); - result.addAll(referencesFromFields(expr, offset, sectioned.getKeywordArgumentFields(), ReferenceType.KEYWORD)); - result.addAll(referencesFromFields(expr, offset, sectioned.getAttributeFields(), ReferenceType.INSTANCE_VARIABLE)); + result.addAll(referencesFromFields(expr, offset, sectioned.getParameterFields(), DocStringParameterReference.ReferenceType.PARAMETER)); + result.addAll(referencesFromFields(expr, offset, sectioned.getKeywordArgumentFields(), DocStringParameterReference.ReferenceType.KEYWORD)); + result.addAll(referencesFromFields(expr, offset, sectioned.getAttributeFields(), DocStringParameterReference.ReferenceType.INSTANCE_VARIABLE)); result.addAll(referencesFromFields(expr, offset, sectioned.getReturnFields(), null)); } return result.toArray(new PsiReference[result.size()]); @@ -110,7 +108,7 @@ public class DocStringReferenceProvider extends PsiReferenceProvider { int offset, @NotNull StructuredDocString docString, @NotNull List paramNames, - @NotNull ReferenceType refType) { + @NotNull DocStringParameterReference.ReferenceType refType) { List result = new ArrayList(); for (Substring name : paramNames) { final String s = name.toString(); @@ -118,7 +116,7 @@ public class DocStringReferenceProvider extends PsiReferenceProvider { final TextRange range = name.getTextRange().shiftRight(offset); result.add(new DocStringParameterReference(element, range, refType)); } - if (refType.equals(ReferenceType.PARAMETER_TYPE)) { + if (refType.equals(DocStringParameterReference.ReferenceType.PARAMETER_TYPE)) { final Substring type = docString.getParamTypeSubstring(s); if (type != null) { result.addAll(parseTypeReferences(element, type, offset)); @@ -131,10 +129,10 @@ public class DocStringReferenceProvider extends PsiReferenceProvider { @NotNull private static List referencesFromFields(@NotNull PyStringLiteralExpression element, int offset, - @NotNull List fields, - @Nullable ReferenceType nameRefType) { + @NotNull List fields, + @Nullable DocStringParameterReference.ReferenceType nameRefType) { final List result = new ArrayList(); - for (SectionField field : fields) { + for (SectionBasedDocString.SectionField field : fields) { final Substring nameSub = field.getNameAsSubstring(); if (nameRefType != null && nameSub != null && !nameSub.isEmpty()) { final TextRange range = nameSub.getTextRange().shiftRight(offset); diff --git a/python/src/com/jetbrains/python/documentation/DocStringTagCompletionContributor.java b/python/src/com/jetbrains/python/documentation/docstrings/DocStringTagCompletionContributor.java similarity index 98% rename from python/src/com/jetbrains/python/documentation/DocStringTagCompletionContributor.java rename to python/src/com/jetbrains/python/documentation/docstrings/DocStringTagCompletionContributor.java index 64ca33f267d4..7980431e8358 100644 --- a/python/src/com/jetbrains/python/documentation/DocStringTagCompletionContributor.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/DocStringTagCompletionContributor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.jetbrains.python.documentation; +package com.jetbrains.python.documentation.docstrings; import com.intellij.codeInsight.completion.*; import com.intellij.codeInsight.lookup.LookupElementBuilder; diff --git a/python/src/com/jetbrains/python/documentation/DocStringTypeReference.java b/python/src/com/jetbrains/python/documentation/docstrings/DocStringTypeReference.java similarity index 99% rename from python/src/com/jetbrains/python/documentation/DocStringTypeReference.java rename to python/src/com/jetbrains/python/documentation/docstrings/DocStringTypeReference.java index f32850c5a0be..680c84d45479 100644 --- a/python/src/com/jetbrains/python/documentation/DocStringTypeReference.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/DocStringTypeReference.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.jetbrains.python.documentation; +package com.jetbrains.python.documentation.docstrings; import com.google.common.collect.Lists; import com.intellij.codeInsight.completion.CompletionUtil; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; +import com.intellij.psi.util.QualifiedName; import com.intellij.util.IncorrectOperationException; import com.jetbrains.python.PyNames; import com.jetbrains.python.psi.*; -import com.intellij.psi.util.QualifiedName; import com.jetbrains.python.psi.impl.ResolveResultList; import com.jetbrains.python.psi.resolve.ImportedResolveResult; import com.jetbrains.python.psi.resolve.QualifiedNameFinder; diff --git a/python/src/com/jetbrains/python/documentation/docstrings/DocStringUpdater.java b/python/src/com/jetbrains/python/documentation/docstrings/DocStringUpdater.java index 1c5775a99b98..fecefd9cc9c1 100644 --- a/python/src/com/jetbrains/python/documentation/docstrings/DocStringUpdater.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/DocStringUpdater.java @@ -17,7 +17,6 @@ package com.jetbrains.python.documentation.docstrings; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; -import com.jetbrains.python.documentation.DocStringLineParser; import com.jetbrains.python.psi.PyIndentUtil; import com.jetbrains.python.toolbox.Substring; import org.jetbrains.annotations.NotNull; diff --git a/python/src/com/jetbrains/python/documentation/DocStringUtil.java b/python/src/com/jetbrains/python/documentation/docstrings/DocStringUtil.java similarity index 99% rename from python/src/com/jetbrains/python/documentation/DocStringUtil.java rename to python/src/com/jetbrains/python/documentation/docstrings/DocStringUtil.java index 3247e4802cee..a1e26d99a20f 100644 --- a/python/src/com/jetbrains/python/documentation/DocStringUtil.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/DocStringUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.jetbrains.python.documentation; +package com.jetbrains.python.documentation.docstrings; import com.intellij.lang.ASTNode; import com.intellij.openapi.module.Module; @@ -28,6 +28,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.ArrayUtil; import com.jetbrains.python.codeInsight.controlflow.ScopeOwner; +import com.jetbrains.python.documentation.PyDocumentationSettings; import com.jetbrains.python.psi.*; import com.jetbrains.python.psi.impl.PyPsiUtils; import com.jetbrains.python.psi.impl.PyStringLiteralExpressionImpl; diff --git a/python/src/com/jetbrains/python/documentation/EpydocString.java b/python/src/com/jetbrains/python/documentation/docstrings/EpydocString.java similarity index 99% rename from python/src/com/jetbrains/python/documentation/EpydocString.java rename to python/src/com/jetbrains/python/documentation/docstrings/EpydocString.java index 386af6c9c7fc..25fb496e9139 100644 --- a/python/src/com/jetbrains/python/documentation/EpydocString.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/EpydocString.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.jetbrains.python.documentation; +package com.jetbrains.python.documentation.docstrings; import com.intellij.openapi.util.text.StringUtil; import com.intellij.xml.util.XmlTagUtilBase; diff --git a/python/src/com/jetbrains/python/documentation/GoogleCodeStyleDocString.java b/python/src/com/jetbrains/python/documentation/docstrings/GoogleCodeStyleDocString.java similarity index 98% rename from python/src/com/jetbrains/python/documentation/GoogleCodeStyleDocString.java rename to python/src/com/jetbrains/python/documentation/docstrings/GoogleCodeStyleDocString.java index ae02f2074e17..c78adc902e2a 100644 --- a/python/src/com/jetbrains/python/documentation/GoogleCodeStyleDocString.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/GoogleCodeStyleDocString.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.jetbrains.python.documentation; +package com.jetbrains.python.documentation.docstrings; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; diff --git a/python/src/com/jetbrains/python/documentation/docstrings/GoogleCodeStyleDocStringUpdater.java b/python/src/com/jetbrains/python/documentation/docstrings/GoogleCodeStyleDocStringUpdater.java index 5e590552f6be..390b1b01a299 100644 --- a/python/src/com/jetbrains/python/documentation/docstrings/GoogleCodeStyleDocStringUpdater.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/GoogleCodeStyleDocStringUpdater.java @@ -15,7 +15,6 @@ */ package com.jetbrains.python.documentation.docstrings; -import com.jetbrains.python.documentation.SectionBasedDocString; import com.jetbrains.python.toolbox.Substring; import org.jetbrains.annotations.NotNull; diff --git a/python/src/com/jetbrains/python/documentation/NumpyDocString.java b/python/src/com/jetbrains/python/documentation/docstrings/NumpyDocString.java similarity index 98% rename from python/src/com/jetbrains/python/documentation/NumpyDocString.java rename to python/src/com/jetbrains/python/documentation/docstrings/NumpyDocString.java index 0211a068361f..16172ab27cfa 100644 --- a/python/src/com/jetbrains/python/documentation/NumpyDocString.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/NumpyDocString.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.jetbrains.python.documentation; +package com.jetbrains.python.documentation.docstrings; import com.intellij.openapi.util.Pair; import com.jetbrains.python.PyNames; diff --git a/python/src/com/jetbrains/python/documentation/docstrings/NumpyDocStringUpdater.java b/python/src/com/jetbrains/python/documentation/docstrings/NumpyDocStringUpdater.java index 32d2047d6e2b..a0a77cfd7c08 100644 --- a/python/src/com/jetbrains/python/documentation/docstrings/NumpyDocStringUpdater.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/NumpyDocStringUpdater.java @@ -15,8 +15,7 @@ */ package com.jetbrains.python.documentation.docstrings; -import com.jetbrains.python.documentation.SectionBasedDocString; -import com.jetbrains.python.documentation.SectionBasedDocString.Section; +import com.jetbrains.python.documentation.docstrings.SectionBasedDocString.Section; import com.jetbrains.python.toolbox.Substring; import org.jetbrains.annotations.NotNull; diff --git a/python/src/com/jetbrains/python/documentation/PlainDocString.java b/python/src/com/jetbrains/python/documentation/docstrings/PlainDocString.java similarity index 98% rename from python/src/com/jetbrains/python/documentation/PlainDocString.java rename to python/src/com/jetbrains/python/documentation/docstrings/PlainDocString.java index c88c061e65f8..b5c89f3c81f5 100644 --- a/python/src/com/jetbrains/python/documentation/PlainDocString.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/PlainDocString.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.jetbrains.python.documentation; +package com.jetbrains.python.documentation.docstrings; import com.jetbrains.python.psi.PyIndentUtil; import com.jetbrains.python.psi.StructuredDocString; diff --git a/python/src/com/jetbrains/python/documentation/PyDocstringGenerator.java b/python/src/com/jetbrains/python/documentation/docstrings/PyDocstringGenerator.java similarity index 99% rename from python/src/com/jetbrains/python/documentation/PyDocstringGenerator.java rename to python/src/com/jetbrains/python/documentation/docstrings/PyDocstringGenerator.java index d78bda5a7e36..247d8ebf731a 100644 --- a/python/src/com/jetbrains/python/documentation/PyDocstringGenerator.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/PyDocstringGenerator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.jetbrains.python.documentation; +package com.jetbrains.python.documentation.docstrings; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -40,7 +40,6 @@ import com.jetbrains.python.PyNames; import com.jetbrains.python.codeInsight.PyCodeInsightSettings; import com.jetbrains.python.debugger.PySignature; import com.jetbrains.python.debugger.PySignatureCacheManager; -import com.jetbrains.python.documentation.docstrings.*; import com.jetbrains.python.psi.*; import com.jetbrains.python.toolbox.Substring; import org.jetbrains.annotations.NotNull; diff --git a/python/src/com/jetbrains/python/documentation/PyStructuredDocstringFormatter.java b/python/src/com/jetbrains/python/documentation/docstrings/PyStructuredDocstringFormatter.java similarity index 98% rename from python/src/com/jetbrains/python/documentation/PyStructuredDocstringFormatter.java rename to python/src/com/jetbrains/python/documentation/docstrings/PyStructuredDocstringFormatter.java index ddfc9cd66aac..526af32c444c 100644 --- a/python/src/com/jetbrains/python/documentation/PyStructuredDocstringFormatter.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/PyStructuredDocstringFormatter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.jetbrains.python.documentation; +package com.jetbrains.python.documentation.docstrings; import com.google.common.collect.Lists; import com.intellij.execution.process.ProcessOutput; @@ -26,6 +26,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.encoding.EncodingProjectManager; import com.intellij.psi.PsiElement; import com.jetbrains.python.PythonHelpersLocator; +import com.jetbrains.python.documentation.PyDocumentationBuilder; import com.jetbrains.python.psi.StructuredDocString; import com.jetbrains.python.sdk.PySdkUtil; import com.jetbrains.python.sdk.PythonEnvUtil; diff --git a/python/src/com/jetbrains/python/documentation/SectionBasedDocString.java b/python/src/com/jetbrains/python/documentation/docstrings/SectionBasedDocString.java similarity index 99% rename from python/src/com/jetbrains/python/documentation/SectionBasedDocString.java rename to python/src/com/jetbrains/python/documentation/docstrings/SectionBasedDocString.java index a2ee4fa2085c..835051471573 100644 --- a/python/src/com/jetbrains/python/documentation/SectionBasedDocString.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/SectionBasedDocString.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.jetbrains.python.documentation; +package com.jetbrains.python.documentation.docstrings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/python/src/com/jetbrains/python/documentation/docstrings/SectionBasedDocStringUpdater.java b/python/src/com/jetbrains/python/documentation/docstrings/SectionBasedDocStringUpdater.java index 585534a1493d..860fe3326c12 100644 --- a/python/src/com/jetbrains/python/documentation/docstrings/SectionBasedDocStringUpdater.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/SectionBasedDocStringUpdater.java @@ -20,9 +20,8 @@ import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; -import com.jetbrains.python.documentation.SectionBasedDocString; -import com.jetbrains.python.documentation.SectionBasedDocString.Section; -import com.jetbrains.python.documentation.SectionBasedDocString.SectionField; +import com.jetbrains.python.documentation.docstrings.SectionBasedDocString.Section; +import com.jetbrains.python.documentation.docstrings.SectionBasedDocString.SectionField; import com.jetbrains.python.psi.PyIndentUtil; import com.jetbrains.python.toolbox.Substring; import org.jetbrains.annotations.NotNull; diff --git a/python/src/com/jetbrains/python/documentation/SphinxDocString.java b/python/src/com/jetbrains/python/documentation/docstrings/SphinxDocString.java similarity index 98% rename from python/src/com/jetbrains/python/documentation/SphinxDocString.java rename to python/src/com/jetbrains/python/documentation/docstrings/SphinxDocString.java index 68ebe3728977..5f850863cdc1 100644 --- a/python/src/com/jetbrains/python/documentation/SphinxDocString.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/SphinxDocString.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.jetbrains.python.documentation; +package com.jetbrains.python.documentation.docstrings; import com.jetbrains.python.toolbox.Substring; import org.jetbrains.annotations.NotNull; diff --git a/python/src/com/jetbrains/python/documentation/TagBasedDocString.java b/python/src/com/jetbrains/python/documentation/docstrings/TagBasedDocString.java similarity index 99% rename from python/src/com/jetbrains/python/documentation/TagBasedDocString.java rename to python/src/com/jetbrains/python/documentation/docstrings/TagBasedDocString.java index 669d4f523f29..745c4f2a953e 100644 --- a/python/src/com/jetbrains/python/documentation/TagBasedDocString.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/TagBasedDocString.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.jetbrains.python.documentation; +package com.jetbrains.python.documentation.docstrings; import com.google.common.collect.Maps; import com.intellij.openapi.util.TextRange; diff --git a/python/src/com/jetbrains/python/documentation/docstrings/TagBasedDocStringUpdater.java b/python/src/com/jetbrains/python/documentation/docstrings/TagBasedDocStringUpdater.java index eda1b91b6d4a..a7cbc1aecaa2 100644 --- a/python/src/com/jetbrains/python/documentation/docstrings/TagBasedDocStringUpdater.java +++ b/python/src/com/jetbrains/python/documentation/docstrings/TagBasedDocStringUpdater.java @@ -15,7 +15,6 @@ */ package com.jetbrains.python.documentation.docstrings; -import com.jetbrains.python.documentation.TagBasedDocString; import com.jetbrains.python.toolbox.Substring; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/python/src/com/jetbrains/python/editor/PythonEnterHandler.java b/python/src/com/jetbrains/python/editor/PythonEnterHandler.java index 64677f0f23e4..c4b87f5fc1b0 100644 --- a/python/src/com/jetbrains/python/editor/PythonEnterHandler.java +++ b/python/src/com/jetbrains/python/editor/PythonEnterHandler.java @@ -35,8 +35,8 @@ import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; import com.intellij.psi.util.PsiTreeUtil; import com.jetbrains.python.PyTokenTypes; import com.jetbrains.python.codeInsight.PyCodeInsightSettings; -import com.jetbrains.python.documentation.DocStringUtil; -import com.jetbrains.python.documentation.PyDocstringGenerator; +import com.jetbrains.python.documentation.docstrings.DocStringUtil; +import com.jetbrains.python.documentation.docstrings.PyDocstringGenerator; import com.jetbrains.python.psi.*; import com.jetbrains.python.psi.impl.PyStringLiteralExpressionImpl; import org.jetbrains.annotations.NotNull; diff --git a/python/src/com/jetbrains/python/editor/PythonSpaceHandler.java b/python/src/com/jetbrains/python/editor/PythonSpaceHandler.java index 822a7323ffed..e1c36da2f456 100644 --- a/python/src/com/jetbrains/python/editor/PythonSpaceHandler.java +++ b/python/src/com/jetbrains/python/editor/PythonSpaceHandler.java @@ -25,7 +25,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; -import com.jetbrains.python.documentation.PyDocstringGenerator; +import com.jetbrains.python.documentation.docstrings.PyDocstringGenerator; import com.jetbrains.python.psi.PyDocStringOwner; import org.jetbrains.annotations.NotNull; diff --git a/python/src/com/jetbrains/python/inspections/PyDocstringInspection.java b/python/src/com/jetbrains/python/inspections/PyDocstringInspection.java index bef55660f381..cd922e8846e2 100644 --- a/python/src/com/jetbrains/python/inspections/PyDocstringInspection.java +++ b/python/src/com/jetbrains/python/inspections/PyDocstringInspection.java @@ -26,8 +26,8 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; import com.jetbrains.python.PyBundle; -import com.jetbrains.python.documentation.DocStringUtil; -import com.jetbrains.python.documentation.PlainDocString; +import com.jetbrains.python.documentation.docstrings.DocStringUtil; +import com.jetbrains.python.documentation.docstrings.PlainDocString; import com.jetbrains.python.inspections.quickfix.DocstringQuickFix; import com.jetbrains.python.psi.*; import com.jetbrains.python.testing.PythonUnitTestUtil; diff --git a/python/src/com/jetbrains/python/inspections/PyDocstringTypesInspection.java b/python/src/com/jetbrains/python/inspections/PyDocstringTypesInspection.java index e012ebf08176..2826dc8d6b6f 100644 --- a/python/src/com/jetbrains/python/inspections/PyDocstringTypesInspection.java +++ b/python/src/com/jetbrains/python/inspections/PyDocstringTypesInspection.java @@ -23,7 +23,7 @@ import com.jetbrains.python.PyBundle; import com.jetbrains.python.debugger.PySignature; import com.jetbrains.python.debugger.PySignatureCacheManager; import com.jetbrains.python.debugger.PySignatureUtil; -import com.jetbrains.python.documentation.DocStringUtil; +import com.jetbrains.python.documentation.docstrings.DocStringUtil; import com.jetbrains.python.psi.PyElementGenerator; import com.jetbrains.python.psi.PyFunction; import com.jetbrains.python.psi.PyStringLiteralExpression; diff --git a/python/src/com/jetbrains/python/inspections/quickfix/DocstringQuickFix.java b/python/src/com/jetbrains/python/inspections/quickfix/DocstringQuickFix.java index 294b592048e3..0622727ebc1b 100644 --- a/python/src/com/jetbrains/python/inspections/quickfix/DocstringQuickFix.java +++ b/python/src/com/jetbrains/python/inspections/quickfix/DocstringQuickFix.java @@ -29,7 +29,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import com.jetbrains.python.PyBundle; import com.jetbrains.python.codeInsight.intentions.PyGenerateDocstringIntention; -import com.jetbrains.python.documentation.PyDocstringGenerator; +import com.jetbrains.python.documentation.docstrings.PyDocstringGenerator; import com.jetbrains.python.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/python/src/com/jetbrains/python/inspections/quickfix/MoveFromFutureImportQuickFix.java b/python/src/com/jetbrains/python/inspections/quickfix/MoveFromFutureImportQuickFix.java index 87f2e1d315cf..585a6d1a3b6d 100644 --- a/python/src/com/jetbrains/python/inspections/quickfix/MoveFromFutureImportQuickFix.java +++ b/python/src/com/jetbrains/python/inspections/quickfix/MoveFromFutureImportQuickFix.java @@ -21,7 +21,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.jetbrains.python.PyBundle; -import com.jetbrains.python.documentation.DocStringUtil; +import com.jetbrains.python.documentation.docstrings.DocStringUtil; import com.jetbrains.python.psi.PyFile; import com.jetbrains.python.psi.PyStringLiteralExpression; import org.jetbrains.annotations.NotNull; diff --git a/python/src/com/jetbrains/python/inspections/quickfix/PyRemoveParameterQuickFix.java b/python/src/com/jetbrains/python/inspections/quickfix/PyRemoveParameterQuickFix.java index bd872fdee632..2b1f60056fc4 100644 --- a/python/src/com/jetbrains/python/inspections/quickfix/PyRemoveParameterQuickFix.java +++ b/python/src/com/jetbrains/python/inspections/quickfix/PyRemoveParameterQuickFix.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.usageView.UsageInfo; import com.jetbrains.python.PyBundle; -import com.jetbrains.python.documentation.PyDocstringGenerator; +import com.jetbrains.python.documentation.docstrings.PyDocstringGenerator; import com.jetbrains.python.psi.*; import com.jetbrains.python.psi.resolve.PyResolveContext; import com.jetbrains.python.refactoring.PyRefactoringUtil; diff --git a/python/src/com/jetbrains/python/inspections/unresolvedReference/PyUnresolvedReferencesInspection.java b/python/src/com/jetbrains/python/inspections/unresolvedReference/PyUnresolvedReferencesInspection.java index dafcd4fa648f..c14ddd476427 100644 --- a/python/src/com/jetbrains/python/inspections/unresolvedReference/PyUnresolvedReferencesInspection.java +++ b/python/src/com/jetbrains/python/inspections/unresolvedReference/PyUnresolvedReferencesInspection.java @@ -49,8 +49,8 @@ import com.jetbrains.python.codeInsight.imports.AutoImportQuickFix; import com.jetbrains.python.codeInsight.imports.OptimizeImportsQuickFix; import com.jetbrains.python.codeInsight.imports.PythonReferenceImporter; import com.jetbrains.python.console.PydevConsoleRunner; -import com.jetbrains.python.documentation.DocStringParameterReference; -import com.jetbrains.python.documentation.DocStringTypeReference; +import com.jetbrains.python.documentation.docstrings.DocStringParameterReference; +import com.jetbrains.python.documentation.docstrings.DocStringTypeReference; import com.jetbrains.python.inspections.*; import com.jetbrains.python.inspections.quickfix.*; import com.jetbrains.python.packaging.PyPIPackageUtil; diff --git a/python/src/com/jetbrains/python/patterns/PythonPatterns.java b/python/src/com/jetbrains/python/patterns/PythonPatterns.java index 5f7d6b9ca64a..643d76135f04 100644 --- a/python/src/com/jetbrains/python/patterns/PythonPatterns.java +++ b/python/src/com/jetbrains/python/patterns/PythonPatterns.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.ProcessingContext; import com.jetbrains.python.codeInsight.controlflow.ScopeOwner; -import com.jetbrains.python.documentation.DocStringUtil; +import com.jetbrains.python.documentation.docstrings.DocStringUtil; import com.jetbrains.python.psi.*; import com.jetbrains.python.psi.resolve.PyResolveContext; import com.jetbrains.python.psi.types.TypeEvalContext; diff --git a/python/src/com/jetbrains/python/psi/impl/PyClassImpl.java b/python/src/com/jetbrains/python/psi/impl/PyClassImpl.java index 0ff40fc7f636..284ab4aedc37 100644 --- a/python/src/com/jetbrains/python/psi/impl/PyClassImpl.java +++ b/python/src/com/jetbrains/python/psi/impl/PyClassImpl.java @@ -39,7 +39,7 @@ import com.jetbrains.python.PythonDialectsTokenSetProvider; import com.jetbrains.python.codeInsight.controlflow.ControlFlowCache; import com.jetbrains.python.codeInsight.controlflow.ScopeOwner; import com.jetbrains.python.codeInsight.dataflow.scope.ScopeUtil; -import com.jetbrains.python.documentation.DocStringUtil; +import com.jetbrains.python.documentation.docstrings.DocStringUtil; import com.jetbrains.python.psi.*; import com.jetbrains.python.psi.resolve.PyResolveContext; import com.jetbrains.python.psi.resolve.PyResolveUtil; diff --git a/python/src/com/jetbrains/python/psi/impl/PyFileImpl.java b/python/src/com/jetbrains/python/psi/impl/PyFileImpl.java index 31f1a2fd0128..fbc2fb36539f 100644 --- a/python/src/com/jetbrains/python/psi/impl/PyFileImpl.java +++ b/python/src/com/jetbrains/python/psi/impl/PyFileImpl.java @@ -42,7 +42,7 @@ import com.jetbrains.python.PyNames; import com.jetbrains.python.PythonFileType; import com.jetbrains.python.PythonLanguage; import com.jetbrains.python.codeInsight.controlflow.ControlFlowCache; -import com.jetbrains.python.documentation.DocStringUtil; +import com.jetbrains.python.documentation.docstrings.DocStringUtil; import com.jetbrains.python.inspections.PythonVisitorFilter; import com.jetbrains.python.psi.*; import com.jetbrains.python.psi.resolve.QualifiedNameFinder; diff --git a/python/src/com/jetbrains/python/psi/impl/PyFunctionBuilder.java b/python/src/com/jetbrains/python/psi/impl/PyFunctionBuilder.java index 5842ca27a31c..1ea473310d3a 100644 --- a/python/src/com/jetbrains/python/psi/impl/PyFunctionBuilder.java +++ b/python/src/com/jetbrains/python/psi/impl/PyFunctionBuilder.java @@ -20,8 +20,8 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.util.ArrayUtil; import com.jetbrains.python.PyNames; -import com.jetbrains.python.documentation.DocStringFormat; -import com.jetbrains.python.documentation.PyDocstringGenerator; +import com.jetbrains.python.documentation.docstrings.DocStringFormat; +import com.jetbrains.python.documentation.docstrings.PyDocstringGenerator; import com.jetbrains.python.psi.*; import org.jetbrains.annotations.NotNull; diff --git a/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java b/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java index 66e9248e0761..cdf338ee18cf 100644 --- a/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java +++ b/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java @@ -41,7 +41,7 @@ import com.jetbrains.python.PyTokenTypes; import com.jetbrains.python.codeInsight.controlflow.ControlFlowCache; import com.jetbrains.python.codeInsight.controlflow.ScopeOwner; import com.jetbrains.python.codeInsight.dataflow.scope.ScopeUtil; -import com.jetbrains.python.documentation.DocStringUtil; +import com.jetbrains.python.documentation.docstrings.DocStringUtil; import com.jetbrains.python.psi.*; import com.jetbrains.python.psi.resolve.QualifiedNameFinder; import com.jetbrains.python.psi.stubs.PyClassStub; diff --git a/python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java b/python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java index 904f20994ed8..4a7479fdc517 100644 --- a/python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java +++ b/python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java @@ -35,7 +35,7 @@ import com.jetbrains.python.PyTokenTypes; import com.jetbrains.python.PythonDialectsTokenSetProvider; import com.jetbrains.python.codeInsight.controlflow.ScopeOwner; import com.jetbrains.python.codeInsight.dataflow.scope.ScopeUtil; -import com.jetbrains.python.documentation.NumpyDocString; +import com.jetbrains.python.documentation.docstrings.NumpyDocString; import com.jetbrains.python.psi.*; import com.jetbrains.python.psi.resolve.PyResolveContext; import com.jetbrains.python.psi.stubs.PyNamedParameterStub; diff --git a/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java b/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java index 9c901130fdb5..b1681339bde5 100644 --- a/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java +++ b/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java @@ -37,7 +37,7 @@ import com.jetbrains.python.codeInsight.controlflow.ControlFlowCache; import com.jetbrains.python.codeInsight.controlflow.ScopeOwner; import com.jetbrains.python.codeInsight.dataflow.scope.Scope; import com.jetbrains.python.codeInsight.dataflow.scope.ScopeUtil; -import com.jetbrains.python.documentation.DocStringUtil; +import com.jetbrains.python.documentation.docstrings.DocStringUtil; import com.jetbrains.python.psi.*; import com.jetbrains.python.psi.impl.references.PyQualifiedReference; import com.jetbrains.python.psi.impl.references.PyTargetReference; diff --git a/python/src/com/jetbrains/python/psi/impl/stubs/PyTargetExpressionElementType.java b/python/src/com/jetbrains/python/psi/impl/stubs/PyTargetExpressionElementType.java index 28e706281efa..ec3aa1deb394 100644 --- a/python/src/com/jetbrains/python/psi/impl/stubs/PyTargetExpressionElementType.java +++ b/python/src/com/jetbrains/python/psi/impl/stubs/PyTargetExpressionElementType.java @@ -24,13 +24,13 @@ import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubOutputStream; import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.util.QualifiedName; import com.intellij.util.io.StringRef; import com.jetbrains.python.PyElementTypes; import com.jetbrains.python.PyNames; import com.jetbrains.python.PythonDialectsTokenSetProvider; -import com.jetbrains.python.documentation.DocStringUtil; +import com.jetbrains.python.documentation.docstrings.DocStringUtil; import com.jetbrains.python.psi.*; -import com.intellij.psi.util.QualifiedName; import com.jetbrains.python.psi.impl.PyTargetExpressionImpl; import com.jetbrains.python.psi.stubs.*; import org.jetbrains.annotations.NotNull; diff --git a/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureUsageProcessor.java b/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureUsageProcessor.java index 319106eea9ef..6ab464b5a7b1 100644 --- a/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureUsageProcessor.java +++ b/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureUsageProcessor.java @@ -33,7 +33,7 @@ import com.intellij.util.containers.HashSet; import com.intellij.util.containers.MultiMap; import com.jetbrains.python.PyNames; import com.jetbrains.python.PythonLanguage; -import com.jetbrains.python.documentation.PyDocstringGenerator; +import com.jetbrains.python.documentation.docstrings.PyDocstringGenerator; import com.jetbrains.python.psi.*; import com.jetbrains.python.psi.search.PyOverridingMethodsSearch; import com.jetbrains.python.refactoring.PyRefactoringUtil; diff --git a/python/src/com/jetbrains/python/testing/PyTestRunnerUpdater.java b/python/src/com/jetbrains/python/testing/PyTestRunnerUpdater.java index ff2684dbd4c9..67449b9b2d2a 100644 --- a/python/src/com/jetbrains/python/testing/PyTestRunnerUpdater.java +++ b/python/src/com/jetbrains/python/testing/PyTestRunnerUpdater.java @@ -34,8 +34,8 @@ import com.intellij.psi.util.PsiTreeUtil; import com.jetbrains.python.PyNames; import com.jetbrains.python.PythonFileType; import com.jetbrains.python.PythonModuleTypeBase; -import com.jetbrains.python.documentation.DocStringFormat; import com.jetbrains.python.documentation.PyDocumentationSettings; +import com.jetbrains.python.documentation.docstrings.DocStringFormat; import com.jetbrains.python.packaging.PyPackageUtil; import com.jetbrains.python.psi.*; import com.jetbrains.python.sdk.PythonSdkType; diff --git a/python/src/com/jetbrains/python/validation/DocStringAnnotator.java b/python/src/com/jetbrains/python/validation/DocStringAnnotator.java index df887b56f238..4b7cff3afacf 100644 --- a/python/src/com/jetbrains/python/validation/DocStringAnnotator.java +++ b/python/src/com/jetbrains/python/validation/DocStringAnnotator.java @@ -18,7 +18,7 @@ package com.jetbrains.python.validation; import com.intellij.lang.annotation.Annotation; import com.intellij.openapi.util.TextRange; import com.jetbrains.python.PyNames; -import com.jetbrains.python.documentation.*; +import com.jetbrains.python.documentation.docstrings.*; import com.jetbrains.python.highlighting.PyHighlighter; import com.jetbrains.python.psi.*; diff --git a/python/testSrc/com/jetbrains/python/EpydocStringTest.java b/python/testSrc/com/jetbrains/python/EpydocStringTest.java index c9d0b87df815..2746f76e15a1 100644 --- a/python/testSrc/com/jetbrains/python/EpydocStringTest.java +++ b/python/testSrc/com/jetbrains/python/EpydocStringTest.java @@ -16,7 +16,7 @@ package com.jetbrains.python; import com.intellij.testFramework.UsefulTestCase; -import com.jetbrains.python.documentation.EpydocString; +import com.jetbrains.python.documentation.docstrings.EpydocString; import com.jetbrains.python.toolbox.Substring; import org.jetbrains.annotations.NotNull; diff --git a/python/testSrc/com/jetbrains/python/PyEditingTest.java b/python/testSrc/com/jetbrains/python/PyEditingTest.java index 9d3c5fadef69..96bb0501f805 100644 --- a/python/testSrc/com/jetbrains/python/PyEditingTest.java +++ b/python/testSrc/com/jetbrains/python/PyEditingTest.java @@ -25,7 +25,7 @@ import com.intellij.openapi.editor.LogicalPosition; import com.intellij.openapi.editor.ex.EditorSettingsExternalizable; import com.intellij.openapi.util.Computable; import com.intellij.psi.PsiFile; -import com.jetbrains.python.documentation.DocStringFormat; +import com.jetbrains.python.documentation.docstrings.DocStringFormat; import com.jetbrains.python.fixtures.PyTestCase; import com.jetbrains.python.psi.LanguageLevel; import org.jetbrains.annotations.NotNull; diff --git a/python/testSrc/com/jetbrains/python/PyQuickDocTest.java b/python/testSrc/com/jetbrains/python/PyQuickDocTest.java index 824c1106b50b..2496c5df31c7 100644 --- a/python/testSrc/com/jetbrains/python/PyQuickDocTest.java +++ b/python/testSrc/com/jetbrains/python/PyQuickDocTest.java @@ -20,9 +20,9 @@ import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.testFramework.TestDataFile; -import com.jetbrains.python.documentation.DocStringFormat; import com.jetbrains.python.documentation.PyDocumentationSettings; import com.jetbrains.python.documentation.PythonDocumentationProvider; +import com.jetbrains.python.documentation.docstrings.DocStringFormat; import com.jetbrains.python.fixtures.LightMarkedTestCase; import com.jetbrains.python.fixtures.PyTestCase; import com.jetbrains.python.psi.*; diff --git a/python/testSrc/com/jetbrains/python/PyQuickFixTest.java b/python/testSrc/com/jetbrains/python/PyQuickFixTest.java index 27f9d2175883..8040ea0cc554 100644 --- a/python/testSrc/com/jetbrains/python/PyQuickFixTest.java +++ b/python/testSrc/com/jetbrains/python/PyQuickFixTest.java @@ -20,7 +20,7 @@ import com.intellij.codeInspection.ex.InspectionProfileImpl; import com.intellij.testFramework.TestDataFile; import com.intellij.testFramework.TestDataPath; import com.jetbrains.python.codeInsight.PyCodeInsightSettings; -import com.jetbrains.python.documentation.DocStringFormat; +import com.jetbrains.python.documentation.docstrings.DocStringFormat; import com.jetbrains.python.fixtures.PyTestCase; import com.jetbrains.python.inspections.*; import com.jetbrains.python.inspections.unresolvedReference.PyUnresolvedReferencesInspection; diff --git a/python/testSrc/com/jetbrains/python/PyResolveTest.java b/python/testSrc/com/jetbrains/python/PyResolveTest.java index a616c64dcda2..e5de1b1b9b41 100644 --- a/python/testSrc/com/jetbrains/python/PyResolveTest.java +++ b/python/testSrc/com/jetbrains/python/PyResolveTest.java @@ -23,7 +23,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.testFramework.UsefulTestCase; import com.jetbrains.python.codeInsight.controlflow.ScopeOwner; import com.jetbrains.python.codeInsight.dataflow.scope.ScopeUtil; -import com.jetbrains.python.documentation.DocStringFormat; +import com.jetbrains.python.documentation.docstrings.DocStringFormat; import com.jetbrains.python.fixtures.PyResolveTestCase; import com.jetbrains.python.psi.*; import com.jetbrains.python.psi.impl.PyPsiUtils; diff --git a/python/testSrc/com/jetbrains/python/PySectionBasedDocStringTest.java b/python/testSrc/com/jetbrains/python/PySectionBasedDocStringTest.java index 85219a189388..c5f41e5db095 100644 --- a/python/testSrc/com/jetbrains/python/PySectionBasedDocStringTest.java +++ b/python/testSrc/com/jetbrains/python/PySectionBasedDocStringTest.java @@ -18,12 +18,12 @@ package com.jetbrains.python; import com.intellij.psi.PsiElement; import com.intellij.psi.search.PsiElementProcessor; import com.intellij.psi.util.PsiTreeUtil; -import com.jetbrains.python.documentation.DocStringUtil; -import com.jetbrains.python.documentation.GoogleCodeStyleDocString; -import com.jetbrains.python.documentation.NumpyDocString; -import com.jetbrains.python.documentation.SectionBasedDocString; -import com.jetbrains.python.documentation.SectionBasedDocString.Section; -import com.jetbrains.python.documentation.SectionBasedDocString.SectionField; +import com.jetbrains.python.documentation.docstrings.DocStringUtil; +import com.jetbrains.python.documentation.docstrings.GoogleCodeStyleDocString; +import com.jetbrains.python.documentation.docstrings.NumpyDocString; +import com.jetbrains.python.documentation.docstrings.SectionBasedDocString; +import com.jetbrains.python.documentation.docstrings.SectionBasedDocString.Section; +import com.jetbrains.python.documentation.docstrings.SectionBasedDocString.SectionField; import com.jetbrains.python.fixtures.PyTestCase; import com.jetbrains.python.psi.PyStringLiteralExpression; import com.jetbrains.python.toolbox.Substring; diff --git a/python/testSrc/com/jetbrains/python/PySmartEnterTest.java b/python/testSrc/com/jetbrains/python/PySmartEnterTest.java index 6266d0573392..e6f3302154fc 100644 --- a/python/testSrc/com/jetbrains/python/PySmartEnterTest.java +++ b/python/testSrc/com/jetbrains/python/PySmartEnterTest.java @@ -23,8 +23,8 @@ import com.intellij.openapi.application.Result; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.editor.Editor; import com.jetbrains.python.codeInsight.PyCodeInsightSettings; -import com.jetbrains.python.documentation.DocStringFormat; import com.jetbrains.python.documentation.PyDocumentationSettings; +import com.jetbrains.python.documentation.docstrings.DocStringFormat; import com.jetbrains.python.fixtures.PyTestCase; import org.jetbrains.annotations.NotNull; diff --git a/python/testSrc/com/jetbrains/python/PythonCompletionTest.java b/python/testSrc/com/jetbrains/python/PythonCompletionTest.java index c57a5eaae244..c394a878081f 100644 --- a/python/testSrc/com/jetbrains/python/PythonCompletionTest.java +++ b/python/testSrc/com/jetbrains/python/PythonCompletionTest.java @@ -23,8 +23,8 @@ import com.intellij.codeInsight.lookup.Lookup; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementBuilder; import com.intellij.testFramework.PsiTestUtil; -import com.jetbrains.python.documentation.DocStringFormat; import com.jetbrains.python.documentation.PyDocumentationSettings; +import com.jetbrains.python.documentation.docstrings.DocStringFormat; import com.jetbrains.python.fixtures.PyTestCase; import com.jetbrains.python.psi.LanguageLevel; import org.jetbrains.annotations.Nullable; diff --git a/python/testSrc/com/jetbrains/python/PythonHighlightingTest.java b/python/testSrc/com/jetbrains/python/PythonHighlightingTest.java index 73ab49e28659..865d2006b695 100644 --- a/python/testSrc/com/jetbrains/python/PythonHighlightingTest.java +++ b/python/testSrc/com/jetbrains/python/PythonHighlightingTest.java @@ -20,8 +20,8 @@ import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.editor.markup.EffectType; import com.intellij.openapi.editor.markup.TextAttributes; -import com.jetbrains.python.documentation.DocStringFormat; import com.jetbrains.python.documentation.PyDocumentationSettings; +import com.jetbrains.python.documentation.docstrings.DocStringFormat; import com.jetbrains.python.fixtures.PyTestCase; import com.jetbrains.python.psi.LanguageLevel; import com.jetbrains.python.psi.impl.PythonLanguageLevelPusher; diff --git a/python/testSrc/com/jetbrains/python/PythonInspectionsTest.java b/python/testSrc/com/jetbrains/python/PythonInspectionsTest.java index 377e4b0c9126..99293512d117 100644 --- a/python/testSrc/com/jetbrains/python/PythonInspectionsTest.java +++ b/python/testSrc/com/jetbrains/python/PythonInspectionsTest.java @@ -18,7 +18,7 @@ package com.jetbrains.python; import com.intellij.codeInspection.InspectionProfileEntry; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.ex.LocalInspectionToolWrapper; -import com.jetbrains.python.documentation.DocStringFormat; +import com.jetbrains.python.documentation.docstrings.DocStringFormat; import com.jetbrains.python.fixtures.PyTestCase; import com.jetbrains.python.inspections.*; import com.jetbrains.python.psi.LanguageLevel; diff --git a/python/testSrc/com/jetbrains/python/fixtures/PyTestCase.java b/python/testSrc/com/jetbrains/python/fixtures/PyTestCase.java index 864ce614b867..6f485c53fcb4 100644 --- a/python/testSrc/com/jetbrains/python/fixtures/PyTestCase.java +++ b/python/testSrc/com/jetbrains/python/fixtures/PyTestCase.java @@ -61,8 +61,8 @@ import com.intellij.util.IncorrectOperationException; import com.jetbrains.python.PythonHelpersLocator; import com.jetbrains.python.PythonLanguage; import com.jetbrains.python.PythonTestUtil; -import com.jetbrains.python.documentation.DocStringFormat; import com.jetbrains.python.documentation.PyDocumentationSettings; +import com.jetbrains.python.documentation.docstrings.DocStringFormat; import com.jetbrains.python.formatter.PyCodeStyleSettings; import com.jetbrains.python.psi.LanguageLevel; import com.jetbrains.python.psi.PyClass; diff --git a/python/testSrc/com/jetbrains/python/intentions/PyIntentionTest.java b/python/testSrc/com/jetbrains/python/intentions/PyIntentionTest.java index de62a0b23fad..a19c4978aaf2 100644 --- a/python/testSrc/com/jetbrains/python/intentions/PyIntentionTest.java +++ b/python/testSrc/com/jetbrains/python/intentions/PyIntentionTest.java @@ -19,8 +19,8 @@ import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.intention.IntentionAction; import com.jetbrains.python.PyBundle; import com.jetbrains.python.codeInsight.PyCodeInsightSettings; -import com.jetbrains.python.documentation.DocStringFormat; import com.jetbrains.python.documentation.PyDocumentationSettings; +import com.jetbrains.python.documentation.docstrings.DocStringFormat; import com.jetbrains.python.fixtures.PyTestCase; import com.jetbrains.python.psi.LanguageLevel; import com.jetbrains.python.psi.impl.PythonLanguageLevelPusher; diff --git a/python/testSrc/com/jetbrains/python/refactoring/PyRenameTest.java b/python/testSrc/com/jetbrains/python/refactoring/PyRenameTest.java index a5f9a3db46ef..83655d41d808 100644 --- a/python/testSrc/com/jetbrains/python/refactoring/PyRenameTest.java +++ b/python/testSrc/com/jetbrains/python/refactoring/PyRenameTest.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement; import com.intellij.refactoring.BaseRefactoringProcessor; import com.intellij.testFramework.PlatformTestUtil; import com.jetbrains.python.PythonTestUtil; -import com.jetbrains.python.documentation.DocStringFormat; +import com.jetbrains.python.documentation.docstrings.DocStringFormat; import com.jetbrains.python.fixtures.PyTestCase; import com.jetbrains.python.psi.LanguageLevel; diff --git a/python/testSrc/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureTest.java b/python/testSrc/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureTest.java index 1125fd56f406..066f7b7f3c8f 100644 --- a/python/testSrc/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureTest.java +++ b/python/testSrc/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureTest.java @@ -23,7 +23,7 @@ import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import com.jetbrains.python.PyBundle; import com.jetbrains.python.PythonFileType; -import com.jetbrains.python.documentation.DocStringFormat; +import com.jetbrains.python.documentation.docstrings.DocStringFormat; import com.jetbrains.python.fixtures.PyTestCase; import com.jetbrains.python.psi.LanguageLevel; import com.jetbrains.python.psi.PyFunction;