From 695682bd16f9c8a5f7cf9034c15c4bad9dcfd702 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 14 Jul 2014 13:44:58 +0200 Subject: [PATCH] structural search: make part of platform --- build/scripts/layouts.gant | 12 ++---------- build/scripts/utils.gant | 3 ++- .../src/META-INF/structuralsearch-java.xml | 2 +- .../JavaPredefinedConfigurations.java | 0 .../structuralsearch/JavaReplaceHandler.java | 0 .../JavaStructuralSearchProfile.java | 0 .../impl/matcher/JavaCompiledPattern.java | 0 .../impl/matcher/JavaMatchPredicateProvider.java | 0 .../impl/matcher/JavaMatchingVisitor.java | 0 .../impl/matcher/compiler/JavaCompilingVisitor.java | 0 .../impl/matcher/filters/BlockFilter.java | 0 .../impl/matcher/filters/ClassFilter.java | 0 .../impl/matcher/filters/CommentFilter.java | 0 .../impl/matcher/filters/ConstantFilter.java | 0 .../impl/matcher/filters/DeclarationFilter.java | 0 .../impl/matcher/filters/ExpressionFilter.java | 0 .../impl/matcher/filters/JavaDocFilter.java | 0 .../impl/matcher/filters/JavaLexicalNodesFilter.java | 0 .../impl/matcher/filters/MethodFilter.java | 0 .../impl/matcher/filters/StatementFilter.java | 0 .../impl/matcher/filters/SymbolNodeFilter.java | 0 .../impl/matcher/filters/TypeFilter.java | 0 .../impl/matcher/filters/TypeParameterFilter.java | 0 .../impl/matcher/filters/TypedSymbolNodeFilter.java | 0 .../impl/matcher/filters/VariableFilter.java | 0 .../handlers/DeclarationStatementHandler.java | 0 .../impl/matcher/handlers/DocDataHandler.java | 0 .../impl/matcher/handlers/ExpressionHandler.java | 0 .../impl/matcher/handlers/StatementHandler.java | 0 .../impl/matcher/iterators/DocValuesIterator.java | 0 .../matcher/iterators/HierarchyNodeIterator.java | 0 .../impl/matcher/predicates/ExprTypePredicate.java | 0 .../matcher/predicates/FormalArgTypePredicate.java | 0 .../impl/matcher/predicates/ReadPredicate.java | 0 .../impl/matcher/predicates/WritePredicate.java | 0 .../matcher/strategies/CommentMatchingStrategy.java | 0 .../matcher/strategies/ExprMatchingStrategy.java | 0 .../matcher/strategies/JavaDocMatchingStrategy.java | 0 .../matcher/strategies/MatchingStrategyBase.java | 0 .../matcher/strategies/SymbolMatchingStrategy.java | 0 .../structuralsearch-java/structuralsearch-java.iml | 0 .../src/com/intellij/ide/customize/PluginGroups.java | 6 +++--- {plugins => platform}/structuralsearch/build.xml | 2 +- .../source/META-INF/structuralsearch.xml | 8 -------- .../DocumentBasedReplaceHandler.java | 0 .../structuralsearch/MalformedPatternException.java | 0 .../com/intellij/structuralsearch/MatchOptions.java | 0 .../com/intellij/structuralsearch/MatchResult.java | 0 .../intellij/structuralsearch/MatchResultSink.java | 0 .../structuralsearch/MatchVariableConstraint.java | 0 .../com/intellij/structuralsearch/Matcher.java | 0 .../intellij/structuralsearch/MatchingProcess.java | 0 .../structuralsearch/NamedScriptableDefinition.java | 0 .../PredefinedConfigurationUtil.java | 0 .../ReplacementVariableDefinition.java | 0 .../com/intellij/structuralsearch/SSRBundle.java | 0 .../structuralsearch/StructuralReplaceHandler.java | 0 .../structuralsearch/StructuralSearchException.java | 0 .../structuralsearch/StructuralSearchProfile.java | 0 .../StructuralSearchProfileBase.java | 0 .../structuralsearch/StructuralSearchUtil.java | 0 .../UnsupportedPatternException.java | 0 .../structuralsearch/XmlStructuralSearchProfile.java | 0 .../impl/matcher/CompiledPattern.java | 0 .../structuralsearch/impl/matcher/DataProvider.java | 0 .../impl/matcher/GlobalMatchingVisitor.java | 0 .../impl/matcher/MatchConstraintsSink.java | 0 .../structuralsearch/impl/matcher/MatchContext.java | 0 .../impl/matcher/MatchPredicateProvider.java | 0 .../impl/matcher/MatchResultImpl.java | 0 .../structuralsearch/impl/matcher/MatchUtils.java | 0 .../structuralsearch/impl/matcher/MatcherImpl.java | 0 .../impl/matcher/MatcherImplUtil.java | 0 .../impl/matcher/PatternTreeContext.java | 0 .../impl/matcher/XmlCompiledPattern.java | 0 .../impl/matcher/XmlMatchingVisitor.java | 0 .../impl/matcher/compiler/CompileContext.java | 0 .../impl/matcher/compiler/DeleteNodesAction.java | 0 .../compiler/FindInFilesOptimizingSearchHelper.java | 0 .../matcher/compiler/GlobalCompilingVisitor.java | 0 .../matcher/compiler/OptimizingSearchHelper.java | 0 .../matcher/compiler/OptimizingSearchHelperBase.java | 0 .../impl/matcher/compiler/PatternCompiler.java | 0 .../compiler/StringToConstraintsTransformer.java | 0 .../compiler/TestModeOptimizingSearchHelper.java | 0 .../impl/matcher/compiler/XmlCompilingVisitor.java | 0 .../impl/matcher/filters/CompositeFilter.java | 0 .../impl/matcher/filters/DefaultFilter.java | 0 .../impl/matcher/filters/LexicalNodesFilter.java | 0 .../impl/matcher/filters/TagValueFilter.java | 0 .../impl/matcher/filters/XmlLexicalNodesFilter.java | 0 .../impl/matcher/handlers/DelegatingHandler.java | 0 .../handlers/LightTopLevelMatchingHandler.java | 0 .../handlers/LiteralWithSubstitutionHandler.java | 0 .../impl/matcher/handlers/MatchPredicate.java | 0 .../impl/matcher/handlers/MatchingHandler.java | 0 .../impl/matcher/handlers/SimpleHandler.java | 0 .../impl/matcher/handlers/SkippingHandler.java | 0 .../impl/matcher/handlers/SubstitutionHandler.java | 0 .../impl/matcher/handlers/SymbolHandler.java | 0 .../matcher/handlers/TopLevelMatchingHandler.java | 0 .../impl/matcher/handlers/TypedSymbolHandler.java | 0 .../impl/matcher/handlers/XmlTextHandler.java | 0 .../matcher/iterators/SsrFilteringNodeIterator.java | 0 .../predicates/AbstractStringBasedPredicate.java | 0 .../impl/matcher/predicates/BinaryPredicate.java | 0 .../impl/matcher/predicates/ContainsPredicate.java | 0 .../impl/matcher/predicates/NotPredicate.java | 0 .../impl/matcher/predicates/ReferencePredicate.java | 0 .../impl/matcher/predicates/RegExpPredicate.java | 0 .../impl/matcher/predicates/ScriptPredicate.java | 0 .../impl/matcher/predicates/ScriptSupport.java | 0 .../impl/matcher/predicates/WithinPredicate.java | 0 .../impl/matcher/strategies/MatchingStrategy.java | 0 .../impl/matcher/strategies/XmlMatchingStrategy.java | 0 .../highlightTemplate/SSBasedInspection.java | 0 .../SSBasedInspectionCompiledPatternsCache.java | 0 .../highlightTemplate/SSBasedInspectionOptions.java | 0 .../plugin/StructuralReplaceAction.java | 0 .../plugin/StructuralSearchAction.java | 0 .../plugin/StructuralSearchPlugin.java | 5 +++-- .../plugin/replace/ReplaceOptions.java | 0 .../plugin/replace/ReplacementInfo.java | 0 .../plugin/replace/impl/ParameterInfo.java | 0 .../plugin/replace/impl/ReplacementBuilder.java | 0 .../plugin/replace/impl/ReplacementContext.java | 0 .../plugin/replace/impl/ReplacementInfoImpl.java | 0 .../plugin/replace/impl/Replacer.java | 0 .../plugin/replace/impl/ReplacerUtil.java | 0 .../plugin/replace/ui/ReplaceCommand.java | 0 .../plugin/replace/ui/ReplaceConfiguration.java | 0 .../plugin/replace/ui/ReplaceDialog.java | 0 .../plugin/replace/ui/ReplaceUsageViewContext.java | 0 .../plugin/replace/ui/ReplacementPreviewDialog.java | 0 .../structuralsearch/plugin/ui/Configuration.java | 0 .../plugin/ui/ConfigurationCreator.java | 0 .../plugin/ui/ConfigurationManager.java | 0 .../structuralsearch/plugin/ui/DialogBase.java | 0 .../plugin/ui/EditVarConstraintsDialog.java | 0 .../plugin/ui/ExistingTemplatesComponent.java | 0 .../structuralsearch/plugin/ui/SearchCommand.java | 0 .../plugin/ui/SearchConfiguration.java | 0 .../structuralsearch/plugin/ui/SearchContext.java | 0 .../structuralsearch/plugin/ui/SearchDialog.java | 0 .../structuralsearch/plugin/ui/SearchModel.java | 0 .../plugin/ui/SelectTemplateDialog.java | 0 .../plugin/ui/SubstitutionShortInfoHandler.java | 0 .../intellij/structuralsearch/plugin/ui/UIUtil.java | 0 .../structuralsearch/plugin/ui/UsageViewContext.java | 0 .../structuralsearch/plugin/ui/VarConstraints.form | 0 .../plugin/util/CollectingMatchResultSink.java | 0 .../plugin/util/SmartPsiPointer.java | 0 .../source/com/intellij/tokenindex/AnonymToken.java | 0 .../source/com/intellij/tokenindex/IndentToken.java | 0 .../com/intellij/tokenindex/LanguageTokenizer.java | 0 .../com/intellij/tokenindex/PathMarkerToken.java | 0 .../com/intellij/tokenindex/PsiMarkerToken.java | 0 .../tokenindex/RecursiveTokenizingVisitor.java | 0 .../source/com/intellij/tokenindex/TextToken.java | 0 .../source/com/intellij/tokenindex/Token.java | 0 .../source/com/intellij/tokenindex/TokenIndex.java | 0 .../com/intellij/tokenindex/TokenIndexKey.java | 0 .../intellij/tokenindex/TokenIndexKeyDescriptor.java | 0 .../source/com/intellij/tokenindex/Tokenizer.java | 0 .../inspectionDescriptions/SSBasedInspection.html | 0 .../source/messages/SSRBundle.properties | 0 .../structuralsearch/structuralsearch-tests.iml | 0 .../structuralsearch/structuralsearch.iml | 0 .../testData/java/DoNotFindReturn.java | 0 ...eformatAndShortenClassRefPerformance_pattern.java | 0 ...matAndShortenClassRefPerformance_replacement.java | 0 ...ReformatAndShortenClassRefPerformance_result.java | 0 ...ReformatAndShortenClassRefPerformance_source.java | 0 .../structuralsearch/testData/java/after1.java | 0 .../structuralsearch/testData/java/after2.java | 0 .../structuralsearch/testData/java/before1.java | 0 .../structuralsearch/testData/java/before2.java | 0 .../testData/ssBased/ExpressionStatement.java | 0 .../testData/ssBased/TwoStatementPattern.java | 0 .../testData/ssBased/simple/expected.xml | 0 .../testData/ssBased/simple/src/x/X.java | 0 .../structuralsearch/OptimizedSearchScanTest.java | 0 .../structuralsearch/SSBasedInspectionTest.java | 4 ++-- .../structuralsearch/SSRCodeInsightTest.java | 4 ++-- .../structuralsearch/StructuralReplaceTest.java | 3 +-- .../structuralsearch/StructuralReplaceTestCase.java | 0 .../structuralsearch/StructuralSearchTest.java | 3 ++- .../structuralsearch/StructuralSearchTestCase.java | 0 .../compiler/StringToConstraintsTransformerTest.java | 0 plugins/groovy/src/META-INF/plugin.xml | 2 +- plugins/groovy/src/META-INF/structuralsearch.xml | 6 ------ plugins/typeMigration/src/META-INF/plugin.xml | 1 - resources/src/META-INF/IdeaPlugin.xml | 1 + 193 files changed, 21 insertions(+), 41 deletions(-) rename plugins/structuralsearch/structuralsearch-java/src/META-INF/java.xml => java/structuralsearch-java/src/META-INF/structuralsearch-java.xml (86%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/JavaPredefinedConfigurations.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/JavaReplaceHandler.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaCompiledPattern.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchPredicateProvider.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/compiler/JavaCompilingVisitor.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/BlockFilter.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/ClassFilter.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/CommentFilter.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/ConstantFilter.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/DeclarationFilter.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/ExpressionFilter.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/JavaDocFilter.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/JavaLexicalNodesFilter.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/MethodFilter.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/StatementFilter.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/SymbolNodeFilter.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/TypeFilter.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/TypeParameterFilter.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/TypedSymbolNodeFilter.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/VariableFilter.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/DeclarationStatementHandler.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/DocDataHandler.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/ExpressionHandler.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/StatementHandler.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/iterators/DocValuesIterator.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/iterators/HierarchyNodeIterator.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/ExprTypePredicate.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/FormalArgTypePredicate.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/ReadPredicate.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/WritePredicate.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/CommentMatchingStrategy.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/ExprMatchingStrategy.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/JavaDocMatchingStrategy.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/MatchingStrategyBase.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/SymbolMatchingStrategy.java (100%) rename {plugins/structuralsearch => java}/structuralsearch-java/structuralsearch-java.iml (100%) rename {plugins => platform}/structuralsearch/build.xml (99%) rename plugins/structuralsearch/structuralsearch-java/src/META-INF/plugin.xml => platform/structuralsearch/source/META-INF/structuralsearch.xml (86%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/DocumentBasedReplaceHandler.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/MalformedPatternException.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/MatchOptions.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/MatchResult.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/MatchResultSink.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/MatchVariableConstraint.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/Matcher.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/MatchingProcess.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/NamedScriptableDefinition.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/PredefinedConfigurationUtil.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/ReplacementVariableDefinition.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/SSRBundle.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/StructuralReplaceHandler.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchException.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfileBase.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchUtil.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/UnsupportedPatternException.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/XmlStructuralSearchProfile.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/CompiledPattern.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/DataProvider.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/GlobalMatchingVisitor.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchConstraintsSink.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchContext.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchPredicateProvider.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchResultImpl.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchUtils.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImpl.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImplUtil.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/PatternTreeContext.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/XmlCompiledPattern.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/XmlMatchingVisitor.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/CompileContext.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/DeleteNodesAction.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/FindInFilesOptimizingSearchHelper.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/GlobalCompilingVisitor.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/OptimizingSearchHelper.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/OptimizingSearchHelperBase.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/PatternCompiler.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/StringToConstraintsTransformer.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/TestModeOptimizingSearchHelper.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/XmlCompilingVisitor.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/CompositeFilter.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/DefaultFilter.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/LexicalNodesFilter.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/TagValueFilter.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/XmlLexicalNodesFilter.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/DelegatingHandler.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/LightTopLevelMatchingHandler.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/LiteralWithSubstitutionHandler.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/MatchPredicate.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/MatchingHandler.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SimpleHandler.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SkippingHandler.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SubstitutionHandler.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SymbolHandler.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/TopLevelMatchingHandler.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/TypedSymbolHandler.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/XmlTextHandler.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/iterators/SsrFilteringNodeIterator.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/AbstractStringBasedPredicate.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/BinaryPredicate.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ContainsPredicate.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/NotPredicate.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ReferencePredicate.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/RegExpPredicate.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptPredicate.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptSupport.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/WithinPredicate.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/strategies/MatchingStrategy.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/strategies/XmlMatchingStrategy.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/inspection/highlightTemplate/SSBasedInspection.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/inspection/highlightTemplate/SSBasedInspectionCompiledPatternsCache.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/inspection/highlightTemplate/SSBasedInspectionOptions.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/StructuralReplaceAction.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/StructuralSearchAction.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/StructuralSearchPlugin.java (96%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ReplaceOptions.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ReplacementInfo.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ParameterInfo.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacementBuilder.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacementContext.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacementInfoImpl.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/Replacer.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacerUtil.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceCommand.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceConfiguration.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceDialog.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceUsageViewContext.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplacementPreviewDialog.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/Configuration.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ConfigurationCreator.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ConfigurationManager.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/DialogBase.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/EditVarConstraintsDialog.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ExistingTemplatesComponent.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchCommand.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchConfiguration.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchContext.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchDialog.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchModel.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SelectTemplateDialog.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SubstitutionShortInfoHandler.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UIUtil.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UsageViewContext.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/VarConstraints.form (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/util/CollectingMatchResultSink.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/structuralsearch/plugin/util/SmartPsiPointer.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/tokenindex/AnonymToken.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/tokenindex/IndentToken.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/tokenindex/LanguageTokenizer.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/tokenindex/PathMarkerToken.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/tokenindex/PsiMarkerToken.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/tokenindex/RecursiveTokenizingVisitor.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/tokenindex/TextToken.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/tokenindex/Token.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/tokenindex/TokenIndex.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/tokenindex/TokenIndexKey.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/tokenindex/TokenIndexKeyDescriptor.java (100%) rename {plugins => platform}/structuralsearch/source/com/intellij/tokenindex/Tokenizer.java (100%) rename {plugins => platform}/structuralsearch/source/inspectionDescriptions/SSBasedInspection.html (100%) rename {plugins => platform}/structuralsearch/source/messages/SSRBundle.properties (100%) rename {plugins => platform}/structuralsearch/structuralsearch-tests.iml (100%) rename {plugins => platform}/structuralsearch/structuralsearch.iml (100%) rename {plugins => platform}/structuralsearch/testData/java/DoNotFindReturn.java (100%) rename {plugins => platform}/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_pattern.java (100%) rename {plugins => platform}/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_replacement.java (100%) rename {plugins => platform}/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_result.java (100%) rename {plugins => platform}/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_source.java (100%) rename {plugins => platform}/structuralsearch/testData/java/after1.java (100%) rename {plugins => platform}/structuralsearch/testData/java/after2.java (100%) rename {plugins => platform}/structuralsearch/testData/java/before1.java (100%) rename {plugins => platform}/structuralsearch/testData/java/before2.java (100%) rename {plugins => platform}/structuralsearch/testData/ssBased/ExpressionStatement.java (100%) rename {plugins => platform}/structuralsearch/testData/ssBased/TwoStatementPattern.java (100%) rename {plugins => platform}/structuralsearch/testData/ssBased/simple/expected.xml (100%) rename {plugins => platform}/structuralsearch/testData/ssBased/simple/src/x/X.java (100%) rename {plugins => platform}/structuralsearch/testSource/com/intellij/structuralsearch/OptimizedSearchScanTest.java (100%) rename {plugins => platform}/structuralsearch/testSource/com/intellij/structuralsearch/SSBasedInspectionTest.java (91%) rename {plugins => platform}/structuralsearch/testSource/com/intellij/structuralsearch/SSRCodeInsightTest.java (94%) rename {plugins => platform}/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTest.java (99%) rename {plugins => platform}/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTestCase.java (100%) rename {plugins => platform}/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java (99%) rename {plugins => platform}/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTestCase.java (100%) rename {plugins => platform}/structuralsearch/testSource/com/intellij/structuralsearch/impl/matcher/compiler/StringToConstraintsTransformerTest.java (100%) delete mode 100644 plugins/groovy/src/META-INF/structuralsearch.xml diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index a46a70ae3d00..c13c9c62c42d 100644 --- a/build/scripts/layouts.gant +++ b/build/scripts/layouts.gant @@ -82,7 +82,8 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir "remote-servers-java-impl", "testFramework", "tests_bootstrap", - "ui-designer-core" + "ui-designer-core", + "structuralsearch-java" ].flatten() implementationModules.removeAll(jpsCommonModules) //todo[nik] remove jps modules from platformImplementationModules instead and update layouts of minor IDEs accordingly @@ -534,15 +535,6 @@ public def layoutCommunityPlugins(String home) { } } - pluginDir("structuralsearch") { - dir("lib") { - jar("structuralsearch.jar") { - module("structuralsearch") - module("structuralsearch-java") - } - } - } - pluginDir("java-decompiler") { dir("lib") { jar("java-decompiler.jar") { diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant index e0cb06b9004c..f23fa4d7bbd9 100644 --- a/build/scripts/utils.gant +++ b/build/scripts/utils.gant @@ -302,7 +302,8 @@ binding.setVariable("platformImplementationModules", [ "xml-structure-view-impl", "protocol-reader-runtime", "script-debugger-backend", - "script-debugger-ui" + "script-debugger-ui", + "structuralsearch" ]) binding.setVariable("layoutMacApp", { String path, String ch, Map args -> diff --git a/plugins/structuralsearch/structuralsearch-java/src/META-INF/java.xml b/java/structuralsearch-java/src/META-INF/structuralsearch-java.xml similarity index 86% rename from plugins/structuralsearch/structuralsearch-java/src/META-INF/java.xml rename to java/structuralsearch-java/src/META-INF/structuralsearch-java.xml index 56c3329f4867..765a70d281bd 100644 --- a/plugins/structuralsearch/structuralsearch-java/src/META-INF/java.xml +++ b/java/structuralsearch-java/src/META-INF/structuralsearch-java.xml @@ -1,4 +1,4 @@ - + diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/JavaPredefinedConfigurations.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaPredefinedConfigurations.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/JavaPredefinedConfigurations.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/JavaPredefinedConfigurations.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/JavaReplaceHandler.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaReplaceHandler.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/JavaReplaceHandler.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/JavaReplaceHandler.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaCompiledPattern.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaCompiledPattern.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaCompiledPattern.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaCompiledPattern.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchPredicateProvider.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchPredicateProvider.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchPredicateProvider.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchPredicateProvider.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/compiler/JavaCompilingVisitor.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/compiler/JavaCompilingVisitor.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/compiler/JavaCompilingVisitor.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/compiler/JavaCompilingVisitor.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/BlockFilter.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/BlockFilter.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/BlockFilter.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/BlockFilter.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/ClassFilter.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/ClassFilter.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/ClassFilter.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/ClassFilter.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/CommentFilter.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/CommentFilter.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/CommentFilter.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/CommentFilter.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/ConstantFilter.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/ConstantFilter.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/ConstantFilter.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/ConstantFilter.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/DeclarationFilter.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/DeclarationFilter.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/DeclarationFilter.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/DeclarationFilter.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/ExpressionFilter.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/ExpressionFilter.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/ExpressionFilter.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/ExpressionFilter.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/JavaDocFilter.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/JavaDocFilter.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/JavaDocFilter.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/JavaDocFilter.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/JavaLexicalNodesFilter.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/JavaLexicalNodesFilter.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/JavaLexicalNodesFilter.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/JavaLexicalNodesFilter.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/MethodFilter.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/MethodFilter.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/MethodFilter.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/MethodFilter.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/StatementFilter.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/StatementFilter.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/StatementFilter.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/StatementFilter.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/SymbolNodeFilter.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/SymbolNodeFilter.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/SymbolNodeFilter.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/SymbolNodeFilter.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/TypeFilter.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/TypeFilter.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/TypeFilter.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/TypeFilter.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/TypeParameterFilter.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/TypeParameterFilter.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/TypeParameterFilter.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/TypeParameterFilter.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/TypedSymbolNodeFilter.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/TypedSymbolNodeFilter.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/TypedSymbolNodeFilter.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/TypedSymbolNodeFilter.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/VariableFilter.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/VariableFilter.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/VariableFilter.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/VariableFilter.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/DeclarationStatementHandler.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/DeclarationStatementHandler.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/DeclarationStatementHandler.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/DeclarationStatementHandler.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/DocDataHandler.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/DocDataHandler.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/DocDataHandler.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/DocDataHandler.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/ExpressionHandler.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/ExpressionHandler.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/ExpressionHandler.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/ExpressionHandler.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/StatementHandler.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/StatementHandler.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/StatementHandler.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/handlers/StatementHandler.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/iterators/DocValuesIterator.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/iterators/DocValuesIterator.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/iterators/DocValuesIterator.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/iterators/DocValuesIterator.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/iterators/HierarchyNodeIterator.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/iterators/HierarchyNodeIterator.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/iterators/HierarchyNodeIterator.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/iterators/HierarchyNodeIterator.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/ExprTypePredicate.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/ExprTypePredicate.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/ExprTypePredicate.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/ExprTypePredicate.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/FormalArgTypePredicate.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/FormalArgTypePredicate.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/FormalArgTypePredicate.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/FormalArgTypePredicate.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/ReadPredicate.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/ReadPredicate.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/ReadPredicate.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/ReadPredicate.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/WritePredicate.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/WritePredicate.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/WritePredicate.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/WritePredicate.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/CommentMatchingStrategy.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/CommentMatchingStrategy.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/CommentMatchingStrategy.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/CommentMatchingStrategy.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/ExprMatchingStrategy.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/ExprMatchingStrategy.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/ExprMatchingStrategy.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/ExprMatchingStrategy.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/JavaDocMatchingStrategy.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/JavaDocMatchingStrategy.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/JavaDocMatchingStrategy.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/JavaDocMatchingStrategy.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/MatchingStrategyBase.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/MatchingStrategyBase.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/MatchingStrategyBase.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/MatchingStrategyBase.java diff --git a/plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/SymbolMatchingStrategy.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/SymbolMatchingStrategy.java similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/SymbolMatchingStrategy.java rename to java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/strategies/SymbolMatchingStrategy.java diff --git a/plugins/structuralsearch/structuralsearch-java/structuralsearch-java.iml b/java/structuralsearch-java/structuralsearch-java.iml similarity index 100% rename from plugins/structuralsearch/structuralsearch-java/structuralsearch-java.iml rename to java/structuralsearch-java/structuralsearch-java.iml diff --git a/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java b/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java index de154f249c9e..930901d55105 100644 --- a/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java +++ b/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java @@ -17,6 +17,7 @@ package com.intellij.ide.customize; import com.intellij.ide.plugins.IdeaPluginDescriptor; import com.intellij.ide.plugins.PluginManager; +import com.intellij.ide.plugins.PluginManagerCore; import com.intellij.ide.plugins.RepositoryHelper; import com.intellij.idea.StartupUtil; import com.intellij.openapi.application.PathManager; @@ -58,14 +59,14 @@ class PluginGroups { } private PluginGroups() { - myAllPlugins = PluginManager.loadDescriptors(null); + myAllPlugins = PluginManagerCore.loadDescriptors(null); try { myPluginsFromRepository.addAll(RepositoryHelper.loadPluginsFromRepository(null)); } catch (Exception e) { //OK, it's offline } - PluginManager.loadDisabledPlugins(new File(PathManager.getConfigPath()).getPath(), myDisabledPluginIds); + PluginManagerCore.loadDisabledPlugins(new File(PathManager.getConfigPath()).getPath(), myDisabledPluginIds); myTree.put(CORE, Pair.create((String)null, Arrays.asList( @@ -74,7 +75,6 @@ class PluginGroups { "org.intellij.intelliLang", "com.intellij.properties", "Refactor-X",//? - "Structural Search", "Type Migration", "ZKM" ))); diff --git a/plugins/structuralsearch/build.xml b/platform/structuralsearch/build.xml similarity index 99% rename from plugins/structuralsearch/build.xml rename to platform/structuralsearch/build.xml index 942281dbfbb1..4472cf7ab550 100644 --- a/plugins/structuralsearch/build.xml +++ b/platform/structuralsearch/build.xml @@ -1,4 +1,4 @@ - + diff --git a/plugins/structuralsearch/structuralsearch-java/src/META-INF/plugin.xml b/platform/structuralsearch/source/META-INF/structuralsearch.xml similarity index 86% rename from plugins/structuralsearch/structuralsearch-java/src/META-INF/plugin.xml rename to platform/structuralsearch/source/META-INF/structuralsearch.xml index c95376c06f13..52c232801cd5 100644 --- a/plugins/structuralsearch/structuralsearch-java/src/META-INF/plugin.xml +++ b/platform/structuralsearch/source/META-INF/structuralsearch.xml @@ -1,12 +1,4 @@ - Structural Search - Searching / replacing source code in terms of syntax (query / replace code by example :-). - - 9.0 - JetBrains - com.intellij.modules.lang - com.intellij.java-i18n - diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/DocumentBasedReplaceHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/DocumentBasedReplaceHandler.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/DocumentBasedReplaceHandler.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/DocumentBasedReplaceHandler.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/MalformedPatternException.java b/platform/structuralsearch/source/com/intellij/structuralsearch/MalformedPatternException.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/MalformedPatternException.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/MalformedPatternException.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/MatchOptions.java b/platform/structuralsearch/source/com/intellij/structuralsearch/MatchOptions.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/MatchOptions.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/MatchOptions.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/MatchResult.java b/platform/structuralsearch/source/com/intellij/structuralsearch/MatchResult.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/MatchResult.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/MatchResult.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/MatchResultSink.java b/platform/structuralsearch/source/com/intellij/structuralsearch/MatchResultSink.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/MatchResultSink.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/MatchResultSink.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/MatchVariableConstraint.java b/platform/structuralsearch/source/com/intellij/structuralsearch/MatchVariableConstraint.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/MatchVariableConstraint.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/MatchVariableConstraint.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/Matcher.java b/platform/structuralsearch/source/com/intellij/structuralsearch/Matcher.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/Matcher.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/Matcher.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/MatchingProcess.java b/platform/structuralsearch/source/com/intellij/structuralsearch/MatchingProcess.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/MatchingProcess.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/MatchingProcess.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/NamedScriptableDefinition.java b/platform/structuralsearch/source/com/intellij/structuralsearch/NamedScriptableDefinition.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/NamedScriptableDefinition.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/NamedScriptableDefinition.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/PredefinedConfigurationUtil.java b/platform/structuralsearch/source/com/intellij/structuralsearch/PredefinedConfigurationUtil.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/PredefinedConfigurationUtil.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/PredefinedConfigurationUtil.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/ReplacementVariableDefinition.java b/platform/structuralsearch/source/com/intellij/structuralsearch/ReplacementVariableDefinition.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/ReplacementVariableDefinition.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/ReplacementVariableDefinition.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/SSRBundle.java b/platform/structuralsearch/source/com/intellij/structuralsearch/SSRBundle.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/SSRBundle.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/SSRBundle.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/StructuralReplaceHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralReplaceHandler.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/StructuralReplaceHandler.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/StructuralReplaceHandler.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchException.java b/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchException.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchException.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchException.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java b/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfileBase.java b/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfileBase.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfileBase.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfileBase.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchUtil.java b/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchUtil.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchUtil.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchUtil.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/UnsupportedPatternException.java b/platform/structuralsearch/source/com/intellij/structuralsearch/UnsupportedPatternException.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/UnsupportedPatternException.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/UnsupportedPatternException.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/XmlStructuralSearchProfile.java b/platform/structuralsearch/source/com/intellij/structuralsearch/XmlStructuralSearchProfile.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/XmlStructuralSearchProfile.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/XmlStructuralSearchProfile.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/CompiledPattern.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/CompiledPattern.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/CompiledPattern.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/CompiledPattern.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/DataProvider.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/DataProvider.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/DataProvider.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/DataProvider.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/GlobalMatchingVisitor.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/GlobalMatchingVisitor.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/GlobalMatchingVisitor.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/GlobalMatchingVisitor.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchConstraintsSink.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchConstraintsSink.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchConstraintsSink.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchConstraintsSink.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchContext.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchContext.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchContext.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchContext.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchPredicateProvider.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchPredicateProvider.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchPredicateProvider.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchPredicateProvider.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchResultImpl.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchResultImpl.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchResultImpl.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchResultImpl.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchUtils.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchUtils.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchUtils.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatchUtils.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImpl.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImpl.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImpl.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImpl.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImplUtil.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImplUtil.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImplUtil.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImplUtil.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/PatternTreeContext.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/PatternTreeContext.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/PatternTreeContext.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/PatternTreeContext.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/XmlCompiledPattern.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/XmlCompiledPattern.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/XmlCompiledPattern.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/XmlCompiledPattern.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/XmlMatchingVisitor.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/XmlMatchingVisitor.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/XmlMatchingVisitor.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/XmlMatchingVisitor.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/CompileContext.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/CompileContext.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/CompileContext.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/CompileContext.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/DeleteNodesAction.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/DeleteNodesAction.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/DeleteNodesAction.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/DeleteNodesAction.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/FindInFilesOptimizingSearchHelper.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/FindInFilesOptimizingSearchHelper.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/FindInFilesOptimizingSearchHelper.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/FindInFilesOptimizingSearchHelper.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/GlobalCompilingVisitor.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/GlobalCompilingVisitor.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/GlobalCompilingVisitor.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/GlobalCompilingVisitor.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/OptimizingSearchHelper.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/OptimizingSearchHelper.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/OptimizingSearchHelper.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/OptimizingSearchHelper.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/OptimizingSearchHelperBase.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/OptimizingSearchHelperBase.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/OptimizingSearchHelperBase.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/OptimizingSearchHelperBase.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/PatternCompiler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/PatternCompiler.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/PatternCompiler.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/PatternCompiler.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/StringToConstraintsTransformer.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/StringToConstraintsTransformer.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/StringToConstraintsTransformer.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/StringToConstraintsTransformer.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/TestModeOptimizingSearchHelper.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/TestModeOptimizingSearchHelper.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/TestModeOptimizingSearchHelper.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/TestModeOptimizingSearchHelper.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/XmlCompilingVisitor.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/XmlCompilingVisitor.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/XmlCompilingVisitor.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/XmlCompilingVisitor.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/CompositeFilter.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/CompositeFilter.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/CompositeFilter.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/CompositeFilter.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/DefaultFilter.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/DefaultFilter.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/DefaultFilter.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/DefaultFilter.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/LexicalNodesFilter.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/LexicalNodesFilter.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/LexicalNodesFilter.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/LexicalNodesFilter.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/TagValueFilter.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/TagValueFilter.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/TagValueFilter.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/TagValueFilter.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/XmlLexicalNodesFilter.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/XmlLexicalNodesFilter.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/XmlLexicalNodesFilter.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/filters/XmlLexicalNodesFilter.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/DelegatingHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/DelegatingHandler.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/DelegatingHandler.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/DelegatingHandler.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/LightTopLevelMatchingHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/LightTopLevelMatchingHandler.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/LightTopLevelMatchingHandler.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/LightTopLevelMatchingHandler.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/LiteralWithSubstitutionHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/LiteralWithSubstitutionHandler.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/LiteralWithSubstitutionHandler.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/LiteralWithSubstitutionHandler.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/MatchPredicate.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/MatchPredicate.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/MatchPredicate.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/MatchPredicate.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/MatchingHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/MatchingHandler.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/MatchingHandler.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/MatchingHandler.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SimpleHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SimpleHandler.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SimpleHandler.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SimpleHandler.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SkippingHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SkippingHandler.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SkippingHandler.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SkippingHandler.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SubstitutionHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SubstitutionHandler.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SubstitutionHandler.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SubstitutionHandler.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SymbolHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SymbolHandler.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SymbolHandler.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SymbolHandler.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/TopLevelMatchingHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/TopLevelMatchingHandler.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/TopLevelMatchingHandler.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/TopLevelMatchingHandler.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/TypedSymbolHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/TypedSymbolHandler.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/TypedSymbolHandler.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/TypedSymbolHandler.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/XmlTextHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/XmlTextHandler.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/XmlTextHandler.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/XmlTextHandler.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/iterators/SsrFilteringNodeIterator.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/iterators/SsrFilteringNodeIterator.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/iterators/SsrFilteringNodeIterator.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/iterators/SsrFilteringNodeIterator.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/AbstractStringBasedPredicate.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/AbstractStringBasedPredicate.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/AbstractStringBasedPredicate.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/AbstractStringBasedPredicate.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/BinaryPredicate.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/BinaryPredicate.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/BinaryPredicate.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/BinaryPredicate.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ContainsPredicate.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ContainsPredicate.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ContainsPredicate.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ContainsPredicate.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/NotPredicate.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/NotPredicate.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/NotPredicate.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/NotPredicate.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ReferencePredicate.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ReferencePredicate.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ReferencePredicate.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ReferencePredicate.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/RegExpPredicate.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/RegExpPredicate.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/RegExpPredicate.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/RegExpPredicate.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptPredicate.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptPredicate.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptPredicate.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptPredicate.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptSupport.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptSupport.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptSupport.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptSupport.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/WithinPredicate.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/WithinPredicate.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/WithinPredicate.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/WithinPredicate.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/strategies/MatchingStrategy.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/strategies/MatchingStrategy.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/strategies/MatchingStrategy.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/strategies/MatchingStrategy.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/strategies/XmlMatchingStrategy.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/strategies/XmlMatchingStrategy.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/strategies/XmlMatchingStrategy.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/strategies/XmlMatchingStrategy.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/inspection/highlightTemplate/SSBasedInspection.java b/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/highlightTemplate/SSBasedInspection.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/inspection/highlightTemplate/SSBasedInspection.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/inspection/highlightTemplate/SSBasedInspection.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/inspection/highlightTemplate/SSBasedInspectionCompiledPatternsCache.java b/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/highlightTemplate/SSBasedInspectionCompiledPatternsCache.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/inspection/highlightTemplate/SSBasedInspectionCompiledPatternsCache.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/inspection/highlightTemplate/SSBasedInspectionCompiledPatternsCache.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/inspection/highlightTemplate/SSBasedInspectionOptions.java b/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/highlightTemplate/SSBasedInspectionOptions.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/inspection/highlightTemplate/SSBasedInspectionOptions.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/inspection/highlightTemplate/SSBasedInspectionOptions.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/StructuralReplaceAction.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/StructuralReplaceAction.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/StructuralReplaceAction.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/StructuralReplaceAction.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/StructuralSearchAction.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/StructuralSearchAction.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/StructuralSearchAction.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/StructuralSearchAction.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/StructuralSearchPlugin.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/StructuralSearchPlugin.java similarity index 96% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/StructuralSearchPlugin.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/StructuralSearchPlugin.java index 23de5efb9cde..9acc1dba66d4 100644 --- a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/StructuralSearchPlugin.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/StructuralSearchPlugin.java @@ -6,6 +6,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.JDOMExternalizable; import com.intellij.structuralsearch.plugin.ui.ConfigurationManager; import com.intellij.structuralsearch.plugin.ui.ExistingTemplatesComponent; +import org.jdom.Element; import org.jetbrains.annotations.NotNull; /** @@ -78,11 +79,11 @@ public final class StructuralSearchPlugin implements ProjectComponent, JDOMExter LoggerHolder.logger.info(str); } - public void readExternal(org.jdom.Element element) { + public void readExternal(Element element) { myConfigurationManager.loadConfigurations(element); } - public void writeExternal(org.jdom.Element element) { + public void writeExternal(Element element) { myConfigurationManager.saveConfigurations(element); } diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ReplaceOptions.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ReplaceOptions.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ReplaceOptions.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ReplaceOptions.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ReplacementInfo.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ReplacementInfo.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ReplacementInfo.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ReplacementInfo.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ParameterInfo.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ParameterInfo.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ParameterInfo.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ParameterInfo.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacementBuilder.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacementBuilder.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacementBuilder.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacementBuilder.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacementContext.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacementContext.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacementContext.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacementContext.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacementInfoImpl.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacementInfoImpl.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacementInfoImpl.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacementInfoImpl.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/Replacer.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/Replacer.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/Replacer.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/Replacer.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacerUtil.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacerUtil.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacerUtil.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/ReplacerUtil.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceCommand.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceCommand.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceCommand.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceCommand.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceConfiguration.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceConfiguration.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceConfiguration.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceConfiguration.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceDialog.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceDialog.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceDialog.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceDialog.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceUsageViewContext.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceUsageViewContext.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceUsageViewContext.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceUsageViewContext.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplacementPreviewDialog.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplacementPreviewDialog.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplacementPreviewDialog.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplacementPreviewDialog.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/Configuration.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/Configuration.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/Configuration.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/Configuration.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ConfigurationCreator.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ConfigurationCreator.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ConfigurationCreator.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ConfigurationCreator.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ConfigurationManager.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ConfigurationManager.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ConfigurationManager.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ConfigurationManager.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/DialogBase.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/DialogBase.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/DialogBase.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/DialogBase.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/EditVarConstraintsDialog.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/EditVarConstraintsDialog.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/EditVarConstraintsDialog.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/EditVarConstraintsDialog.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ExistingTemplatesComponent.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ExistingTemplatesComponent.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ExistingTemplatesComponent.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ExistingTemplatesComponent.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchCommand.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchCommand.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchCommand.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchCommand.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchConfiguration.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchConfiguration.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchConfiguration.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchConfiguration.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchContext.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchContext.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchContext.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchContext.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchDialog.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchDialog.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchDialog.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchDialog.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchModel.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchModel.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchModel.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchModel.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SelectTemplateDialog.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SelectTemplateDialog.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SelectTemplateDialog.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SelectTemplateDialog.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SubstitutionShortInfoHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SubstitutionShortInfoHandler.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SubstitutionShortInfoHandler.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SubstitutionShortInfoHandler.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UIUtil.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UIUtil.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UIUtil.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UIUtil.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UsageViewContext.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UsageViewContext.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UsageViewContext.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UsageViewContext.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/VarConstraints.form b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/VarConstraints.form similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/VarConstraints.form rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/VarConstraints.form diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/util/CollectingMatchResultSink.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/util/CollectingMatchResultSink.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/util/CollectingMatchResultSink.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/util/CollectingMatchResultSink.java diff --git a/plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/util/SmartPsiPointer.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/util/SmartPsiPointer.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/structuralsearch/plugin/util/SmartPsiPointer.java rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/util/SmartPsiPointer.java diff --git a/plugins/structuralsearch/source/com/intellij/tokenindex/AnonymToken.java b/platform/structuralsearch/source/com/intellij/tokenindex/AnonymToken.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/tokenindex/AnonymToken.java rename to platform/structuralsearch/source/com/intellij/tokenindex/AnonymToken.java diff --git a/plugins/structuralsearch/source/com/intellij/tokenindex/IndentToken.java b/platform/structuralsearch/source/com/intellij/tokenindex/IndentToken.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/tokenindex/IndentToken.java rename to platform/structuralsearch/source/com/intellij/tokenindex/IndentToken.java diff --git a/plugins/structuralsearch/source/com/intellij/tokenindex/LanguageTokenizer.java b/platform/structuralsearch/source/com/intellij/tokenindex/LanguageTokenizer.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/tokenindex/LanguageTokenizer.java rename to platform/structuralsearch/source/com/intellij/tokenindex/LanguageTokenizer.java diff --git a/plugins/structuralsearch/source/com/intellij/tokenindex/PathMarkerToken.java b/platform/structuralsearch/source/com/intellij/tokenindex/PathMarkerToken.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/tokenindex/PathMarkerToken.java rename to platform/structuralsearch/source/com/intellij/tokenindex/PathMarkerToken.java diff --git a/plugins/structuralsearch/source/com/intellij/tokenindex/PsiMarkerToken.java b/platform/structuralsearch/source/com/intellij/tokenindex/PsiMarkerToken.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/tokenindex/PsiMarkerToken.java rename to platform/structuralsearch/source/com/intellij/tokenindex/PsiMarkerToken.java diff --git a/plugins/structuralsearch/source/com/intellij/tokenindex/RecursiveTokenizingVisitor.java b/platform/structuralsearch/source/com/intellij/tokenindex/RecursiveTokenizingVisitor.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/tokenindex/RecursiveTokenizingVisitor.java rename to platform/structuralsearch/source/com/intellij/tokenindex/RecursiveTokenizingVisitor.java diff --git a/plugins/structuralsearch/source/com/intellij/tokenindex/TextToken.java b/platform/structuralsearch/source/com/intellij/tokenindex/TextToken.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/tokenindex/TextToken.java rename to platform/structuralsearch/source/com/intellij/tokenindex/TextToken.java diff --git a/plugins/structuralsearch/source/com/intellij/tokenindex/Token.java b/platform/structuralsearch/source/com/intellij/tokenindex/Token.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/tokenindex/Token.java rename to platform/structuralsearch/source/com/intellij/tokenindex/Token.java diff --git a/plugins/structuralsearch/source/com/intellij/tokenindex/TokenIndex.java b/platform/structuralsearch/source/com/intellij/tokenindex/TokenIndex.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/tokenindex/TokenIndex.java rename to platform/structuralsearch/source/com/intellij/tokenindex/TokenIndex.java diff --git a/plugins/structuralsearch/source/com/intellij/tokenindex/TokenIndexKey.java b/platform/structuralsearch/source/com/intellij/tokenindex/TokenIndexKey.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/tokenindex/TokenIndexKey.java rename to platform/structuralsearch/source/com/intellij/tokenindex/TokenIndexKey.java diff --git a/plugins/structuralsearch/source/com/intellij/tokenindex/TokenIndexKeyDescriptor.java b/platform/structuralsearch/source/com/intellij/tokenindex/TokenIndexKeyDescriptor.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/tokenindex/TokenIndexKeyDescriptor.java rename to platform/structuralsearch/source/com/intellij/tokenindex/TokenIndexKeyDescriptor.java diff --git a/plugins/structuralsearch/source/com/intellij/tokenindex/Tokenizer.java b/platform/structuralsearch/source/com/intellij/tokenindex/Tokenizer.java similarity index 100% rename from plugins/structuralsearch/source/com/intellij/tokenindex/Tokenizer.java rename to platform/structuralsearch/source/com/intellij/tokenindex/Tokenizer.java diff --git a/plugins/structuralsearch/source/inspectionDescriptions/SSBasedInspection.html b/platform/structuralsearch/source/inspectionDescriptions/SSBasedInspection.html similarity index 100% rename from plugins/structuralsearch/source/inspectionDescriptions/SSBasedInspection.html rename to platform/structuralsearch/source/inspectionDescriptions/SSBasedInspection.html diff --git a/plugins/structuralsearch/source/messages/SSRBundle.properties b/platform/structuralsearch/source/messages/SSRBundle.properties similarity index 100% rename from plugins/structuralsearch/source/messages/SSRBundle.properties rename to platform/structuralsearch/source/messages/SSRBundle.properties diff --git a/plugins/structuralsearch/structuralsearch-tests.iml b/platform/structuralsearch/structuralsearch-tests.iml similarity index 100% rename from plugins/structuralsearch/structuralsearch-tests.iml rename to platform/structuralsearch/structuralsearch-tests.iml diff --git a/plugins/structuralsearch/structuralsearch.iml b/platform/structuralsearch/structuralsearch.iml similarity index 100% rename from plugins/structuralsearch/structuralsearch.iml rename to platform/structuralsearch/structuralsearch.iml diff --git a/plugins/structuralsearch/testData/java/DoNotFindReturn.java b/platform/structuralsearch/testData/java/DoNotFindReturn.java similarity index 100% rename from plugins/structuralsearch/testData/java/DoNotFindReturn.java rename to platform/structuralsearch/testData/java/DoNotFindReturn.java diff --git a/plugins/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_pattern.java b/platform/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_pattern.java similarity index 100% rename from plugins/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_pattern.java rename to platform/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_pattern.java diff --git a/plugins/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_replacement.java b/platform/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_replacement.java similarity index 100% rename from plugins/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_replacement.java rename to platform/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_replacement.java diff --git a/plugins/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_result.java b/platform/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_result.java similarity index 100% rename from plugins/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_result.java rename to platform/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_result.java diff --git a/plugins/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_source.java b/platform/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_source.java similarity index 100% rename from plugins/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_source.java rename to platform/structuralsearch/testData/java/ReformatAndShortenClassRefPerformance_source.java diff --git a/plugins/structuralsearch/testData/java/after1.java b/platform/structuralsearch/testData/java/after1.java similarity index 100% rename from plugins/structuralsearch/testData/java/after1.java rename to platform/structuralsearch/testData/java/after1.java diff --git a/plugins/structuralsearch/testData/java/after2.java b/platform/structuralsearch/testData/java/after2.java similarity index 100% rename from plugins/structuralsearch/testData/java/after2.java rename to platform/structuralsearch/testData/java/after2.java diff --git a/plugins/structuralsearch/testData/java/before1.java b/platform/structuralsearch/testData/java/before1.java similarity index 100% rename from plugins/structuralsearch/testData/java/before1.java rename to platform/structuralsearch/testData/java/before1.java diff --git a/plugins/structuralsearch/testData/java/before2.java b/platform/structuralsearch/testData/java/before2.java similarity index 100% rename from plugins/structuralsearch/testData/java/before2.java rename to platform/structuralsearch/testData/java/before2.java diff --git a/plugins/structuralsearch/testData/ssBased/ExpressionStatement.java b/platform/structuralsearch/testData/ssBased/ExpressionStatement.java similarity index 100% rename from plugins/structuralsearch/testData/ssBased/ExpressionStatement.java rename to platform/structuralsearch/testData/ssBased/ExpressionStatement.java diff --git a/plugins/structuralsearch/testData/ssBased/TwoStatementPattern.java b/platform/structuralsearch/testData/ssBased/TwoStatementPattern.java similarity index 100% rename from plugins/structuralsearch/testData/ssBased/TwoStatementPattern.java rename to platform/structuralsearch/testData/ssBased/TwoStatementPattern.java diff --git a/plugins/structuralsearch/testData/ssBased/simple/expected.xml b/platform/structuralsearch/testData/ssBased/simple/expected.xml similarity index 100% rename from plugins/structuralsearch/testData/ssBased/simple/expected.xml rename to platform/structuralsearch/testData/ssBased/simple/expected.xml diff --git a/plugins/structuralsearch/testData/ssBased/simple/src/x/X.java b/platform/structuralsearch/testData/ssBased/simple/src/x/X.java similarity index 100% rename from plugins/structuralsearch/testData/ssBased/simple/src/x/X.java rename to platform/structuralsearch/testData/ssBased/simple/src/x/X.java diff --git a/plugins/structuralsearch/testSource/com/intellij/structuralsearch/OptimizedSearchScanTest.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/OptimizedSearchScanTest.java similarity index 100% rename from plugins/structuralsearch/testSource/com/intellij/structuralsearch/OptimizedSearchScanTest.java rename to platform/structuralsearch/testSource/com/intellij/structuralsearch/OptimizedSearchScanTest.java diff --git a/plugins/structuralsearch/testSource/com/intellij/structuralsearch/SSBasedInspectionTest.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/SSBasedInspectionTest.java similarity index 91% rename from plugins/structuralsearch/testSource/com/intellij/structuralsearch/SSBasedInspectionTest.java rename to platform/structuralsearch/testSource/com/intellij/structuralsearch/SSBasedInspectionTest.java index 7971c1009fbd..ff2083ebfbfa 100644 --- a/plugins/structuralsearch/testSource/com/intellij/structuralsearch/SSBasedInspectionTest.java +++ b/platform/structuralsearch/testSource/com/intellij/structuralsearch/SSBasedInspectionTest.java @@ -1,11 +1,11 @@ package com.intellij.structuralsearch; import com.intellij.codeInspection.ex.LocalInspectionToolWrapper; -import com.intellij.openapi.application.PluginPathManager; import com.intellij.structuralsearch.inspection.highlightTemplate.SSBasedInspection; import com.intellij.structuralsearch.plugin.ui.Configuration; import com.intellij.structuralsearch.plugin.ui.SearchConfiguration; import com.intellij.testFramework.InspectionTestCase; +import com.intellij.testFramework.PlatformTestUtil; import java.util.ArrayList; import java.util.List; @@ -42,6 +42,6 @@ public class SSBasedInspectionTest extends InspectionTestCase { } protected String getTestDataPath() { - return PluginPathManager.getPluginHomePath("structuralsearch") + "/testData"; + return PlatformTestUtil.getCommunityPath() + "/platform/structuralsearch/testData/"; } } diff --git a/plugins/structuralsearch/testSource/com/intellij/structuralsearch/SSRCodeInsightTest.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/SSRCodeInsightTest.java similarity index 94% rename from plugins/structuralsearch/testSource/com/intellij/structuralsearch/SSRCodeInsightTest.java rename to platform/structuralsearch/testSource/com/intellij/structuralsearch/SSRCodeInsightTest.java index 5031f821c581..95cd33b0845a 100644 --- a/plugins/structuralsearch/testSource/com/intellij/structuralsearch/SSRCodeInsightTest.java +++ b/platform/structuralsearch/testSource/com/intellij/structuralsearch/SSRCodeInsightTest.java @@ -1,10 +1,10 @@ package com.intellij.structuralsearch; -import com.intellij.openapi.application.PluginPathManager; import com.intellij.structuralsearch.inspection.highlightTemplate.SSBasedInspection; import com.intellij.structuralsearch.plugin.ui.Configuration; import com.intellij.structuralsearch.plugin.ui.SearchConfiguration; import com.intellij.testFramework.IdeaTestCase; +import com.intellij.testFramework.PlatformTestUtil; import com.intellij.testFramework.UsefulTestCase; import com.intellij.testFramework.fixtures.*; import com.intellij.testFramework.fixtures.impl.LightTempDirTestFixtureImpl; @@ -70,6 +70,6 @@ public class SSRCodeInsightTest extends UsefulTestCase { } protected String getTestDataPath() { - return PluginPathManager.getPluginHomePath("structuralsearch") + "/testData/ssBased"; + return PlatformTestUtil.getCommunityPath() + "/platform/structuralsearch/testData/ssBased"; } } diff --git a/plugins/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTest.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTest.java similarity index 99% rename from plugins/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTest.java rename to platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTest.java index d5848b611867..de9b668be4d3 100644 --- a/plugins/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTest.java +++ b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTest.java @@ -1,6 +1,5 @@ package com.intellij.structuralsearch; -import com.intellij.openapi.application.PluginPathManager; import com.intellij.psi.CommonClassNames; import com.intellij.testFramework.PlatformTestUtil; import com.intellij.util.ThrowableRunnable; @@ -1457,7 +1456,7 @@ public class StructuralReplaceTest extends StructuralReplaceTestCase { @NotNull @Override protected String getTestDataPath() { - return PluginPathManager.getPluginHomePath("structuralsearch") + "/testData/"; + return PlatformTestUtil.getCommunityPath() + "/platform/structuralsearch/testData/"; } public void testClassReplacement9() throws IOException { diff --git a/plugins/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTestCase.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTestCase.java similarity index 100% rename from plugins/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTestCase.java rename to platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTestCase.java diff --git a/plugins/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java similarity index 99% rename from plugins/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java rename to platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java index a3fecba980df..682ed0d6652c 100644 --- a/plugins/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java +++ b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java @@ -5,6 +5,7 @@ import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.psi.*; import com.intellij.structuralsearch.impl.matcher.MatcherImplUtil; +import com.intellij.testFramework.PlatformTestUtil; import org.jetbrains.annotations.NotNull; import java.io.IOException; @@ -2583,7 +2584,7 @@ public class StructuralSearchTest extends StructuralSearchTestCase { @NotNull @Override protected String getTestDataPath() { - return PluginPathManager.getPluginHomePath("structuralsearch") + "/testData/java/"; + return PlatformTestUtil.getCommunityPath() + "/platform/structuralsearch/testData/java/"; } public void testDoNotFindReturn() throws IOException { diff --git a/plugins/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTestCase.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTestCase.java similarity index 100% rename from plugins/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTestCase.java rename to platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTestCase.java diff --git a/plugins/structuralsearch/testSource/com/intellij/structuralsearch/impl/matcher/compiler/StringToConstraintsTransformerTest.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/impl/matcher/compiler/StringToConstraintsTransformerTest.java similarity index 100% rename from plugins/structuralsearch/testSource/com/intellij/structuralsearch/impl/matcher/compiler/StringToConstraintsTransformerTest.java rename to platform/structuralsearch/testSource/com/intellij/structuralsearch/impl/matcher/compiler/StringToConstraintsTransformerTest.java diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml index f7e523ac3352..c0020404e2ef 100644 --- a/plugins/groovy/src/META-INF/plugin.xml +++ b/plugins/groovy/src/META-INF/plugin.xml @@ -25,7 +25,6 @@ org.intellij.intelliLang AntSupport ByteCodeViewer - Structural Search @@ -1517,6 +1516,7 @@ implementationClass="org.jetbrains.plugins.groovy.refactoring.memberPullUp.GrPullUpHelperFactory"/> + diff --git a/plugins/groovy/src/META-INF/structuralsearch.xml b/plugins/groovy/src/META-INF/structuralsearch.xml deleted file mode 100644 index b3b6193771de..000000000000 --- a/plugins/groovy/src/META-INF/structuralsearch.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/plugins/typeMigration/src/META-INF/plugin.xml b/plugins/typeMigration/src/META-INF/plugin.xml index 93ad2032892c..6907cfafac20 100644 --- a/plugins/typeMigration/src/META-INF/plugin.xml +++ b/plugins/typeMigration/src/META-INF/plugin.xml @@ -35,5 +35,4 @@ Declaration - Structural Search diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml index cefe1eb3c08d..8c44bd7a2b3f 100644 --- a/resources/src/META-INF/IdeaPlugin.xml +++ b/resources/src/META-INF/IdeaPlugin.xml @@ -9,6 +9,7 @@ +