diff --git a/.idea/modules.xml b/.idea/modules.xml index 07b53a7f23bf..65298da6b18b 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -711,6 +711,7 @@ + diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml index 2446fa94e56a..019fbf2d09d2 100644 --- a/intellij.idea.community.main.iml +++ b/intellij.idea.community.main.iml @@ -204,5 +204,6 @@ + \ No newline at end of file diff --git a/json/intellij.json.iml b/json/intellij.json.iml index aa4f218c3af5..80d28e4fce18 100644 --- a/json/intellij.json.iml +++ b/json/intellij.json.iml @@ -20,7 +20,6 @@ - diff --git a/json/resources/intellij.json.xml b/json/resources/intellij.json.xml index d505cdbde3b9..091cad5b6dcd 100644 --- a/json/resources/intellij.json.xml +++ b/json/resources/intellij.json.xml @@ -7,16 +7,6 @@ - - - - - - - - - @@ -155,39 +145,6 @@ - - - - - - - - - - - - - - - - - JSONPath - com.intellij.jsonpath.ui.JsonPathEvaluateIntentionAction - messages.JsonBundle - json.intention.category.name - diff --git a/json/resources/messages/JsonBundle.properties b/json/resources/messages/JsonBundle.properties index ed894e43e03f..1728b89bb628 100644 --- a/json/resources/messages/JsonBundle.properties +++ b/json/resources/messages/JsonBundle.properties @@ -31,11 +31,6 @@ inspection.duplicate.keys.msg.duplicate.keys=Object contains duplicate keys ''{0 inspection.jsonpath.unknown.function=Unknown JSONPath function inspection.jsonpath.unknown.operator=Unknown JSONPath operator inspection.jsonpath.unknown.key=Unknown property key used for JSONPath evaluate expression -inspection.message.jsonpath.unknown.function.name=Unknown function name ''{0}'' -inspection.message.jsonpath.unknown.operator.name=Unknown operator ''{0}'' -inspection.message.jsonpath.unknown.key=Property key ''{0}'' is not defined in the source JSON document -inspection.message.jsonpath.unsupported.jayway.function=Function {0} is not supported in Jayway JSONPath implementation -inspection.message.jsonpath.unsupported.jayway.operator=Operator {0} is not supported in Jayway JSONPath implementation # Formatter formatter.align.properties.caption=Align @@ -80,7 +75,6 @@ json.schema.ref.no.array.element=Array doesn''t contain element with index ''{0} json.schema.ref.no.property=Property ''{0}'' not found settings.display.name.json=JSON -settings.display.name.jsonpath=JSONPath settings.json.schema.add.mapping=Add mapping settings.json.schema.edit.mapping=Edit mapping @@ -144,46 +138,6 @@ color.page.attribute.invalid.escape.sequence=Invalid escape sequence color.page.attribute.valid.escape.sequence=Valid escape sequence color.page.attribute.parameter=Parameter -jsonpath.color.page.keyword=Keyword -jsonpath.color.page.identifier=Identifier -jsonpath.color.page.string=String -jsonpath.color.page.number=Number -jsonpath.color.page.boolean=Boolean -jsonpath.color.page.function=Function call -jsonpath.color.page.context=Context variable -jsonpath.color.page.brackets=Braces and Operators//Brackets -jsonpath.color.page.braces=Braces and Operators//Braces -jsonpath.color.page.colon=Braces and Operators//Colon -jsonpath.color.page.comma=Braces and Operators//Comma -jsonpath.color.page.dot=Braces and Operators//Dot -jsonpath.color.page.operation.sign=Braces and Operators//Operation sign -jsonpath.color.page.parentheses=Braces and Operators//Parentheses - -jsonpath.completion.key=key -jsonpath.evaluate.no.result=Evaluate expression to see result -jsonpath.toolwindow.evaluate.stripe=Evaluate JSONPath -jsonpath.toolwindow.evaluate.on.snippet=Snippet -jsonpath.toolwindow.evaluate.on.snippet.n=Snippet ({0}) -jsonpath.toolwindow.evaluate.on.file=File {0} -jsonpath.evaluate.intention=Evaluate JSONPath Expression -jsonpath.evaluate.export.result=Export Result of JSONPath Evaluate -jsonpath.evaluate.progress.export.result=Exporting JSONPath evaluate result - -jsonpath.evaluate.add.tab.text=New Tab -jsonpath.evaluate.input=JSON input: -jsonpath.evaluate.result=Result: - -jsonpath.evaluate.options=Options -jsonpath.evaluate.output.option=Output: -jsonpath.evaluate.output.values=Matching Values -jsonpath.evaluate.output.paths=Path Expressions - -jsonpath.evaluate.suppress.exceptions=Suppress Exceptions During Evaluate -jsonpath.evaluate.return.list=Always Return Result List -jsonpath.evaluate.nullize.missing.leaf=Return Null for Missing Leaf -jsonpath.evaluate.require.all.properties=Require All Properties -jsonpath.evaluate.file.not.found=Input file not found - qualified.name.qualified=qualified name qualified.name.pointer=JSON pointer diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt index 3f32ee0ebacc..77a99a1ae2b9 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt @@ -68,6 +68,7 @@ object CommunityRepositoryModules { plugin("intellij.vcs.svn") { spec -> spec.withProjectLibrary("sqlite") }, + plugin("intellij.jsonpath"), plugin("intellij.xpath") { spec -> spec.withModule("intellij.xpath.rt", "rt/xslt-rt.jar") }, diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties index 3f65134b1b51..cea4a401696b 100644 --- a/platform/platform-resources-en/src/messages/ActionsBundle.properties +++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties @@ -2466,9 +2466,6 @@ action.Graph.ZoomIn.text=Zoom In action.JsonCopyPointer.text=Copy JSON Pointer action.JsonCopyPointer.description=Copy JSON Pointer -action.JsonPathEvaluateAction.text=Evaluate JSONPath Expression... -action.JsonPathExportEvaluateResultAction.text=Export Result - action.ExternalSystem.RemoveRunConfiguration.text=Remove Run Configuration action.ExternalSystem.EditRunConfiguration.text=Edit Run Configuration... action.ExternalSystem.ShowIgnored.text=Show Ignored diff --git a/json/gen/com/intellij/jsonpath/lexer/_JsonPathLexer.java b/plugins/jsonpath/gen/com/intellij/jsonpath/lexer/_JsonPathLexer.java similarity index 100% rename from json/gen/com/intellij/jsonpath/lexer/_JsonPathLexer.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/lexer/_JsonPathLexer.java diff --git a/json/gen/com/intellij/jsonpath/parser/JsonPathParser.java b/plugins/jsonpath/gen/com/intellij/jsonpath/parser/JsonPathParser.java similarity index 100% rename from json/gen/com/intellij/jsonpath/parser/JsonPathParser.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/parser/JsonPathParser.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathAndExpression.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathAndExpression.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathAndExpression.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathAndExpression.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathArrayValue.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathArrayValue.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathArrayValue.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathArrayValue.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathBinaryConditionalOperator.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathBinaryConditionalOperator.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathBinaryConditionalOperator.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathBinaryConditionalOperator.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathBooleanLiteral.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathBooleanLiteral.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathBooleanLiteral.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathBooleanLiteral.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathConditionalExpression.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathConditionalExpression.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathConditionalExpression.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathConditionalExpression.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathDivideExpression.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathDivideExpression.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathDivideExpression.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathDivideExpression.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathEvalSegment.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathEvalSegment.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathEvalSegment.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathEvalSegment.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathExpression.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathExpression.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathExpression.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathExpression.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathExpressionSegment.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathExpressionSegment.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathExpressionSegment.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathExpressionSegment.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathFilterExpression.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathFilterExpression.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathFilterExpression.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathFilterExpression.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathFunctionArgsList.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathFunctionArgsList.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathFunctionArgsList.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathFunctionArgsList.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathFunctionCall.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathFunctionCall.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathFunctionCall.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathFunctionCall.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathId.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathId.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathId.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathId.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathIdSegment.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathIdSegment.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathIdSegment.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathIdSegment.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathIndexExpression.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathIndexExpression.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathIndexExpression.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathIndexExpression.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathIndexesList.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathIndexesList.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathIndexesList.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathIndexesList.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathLiteralValue.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathLiteralValue.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathLiteralValue.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathLiteralValue.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathMinusExpression.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathMinusExpression.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathMinusExpression.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathMinusExpression.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathMultiplyExpression.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathMultiplyExpression.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathMultiplyExpression.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathMultiplyExpression.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathNullLiteral.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathNullLiteral.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathNullLiteral.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathNullLiteral.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathNumberLiteral.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathNumberLiteral.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathNumberLiteral.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathNumberLiteral.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathObjectProperty.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathObjectProperty.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathObjectProperty.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathObjectProperty.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathObjectValue.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathObjectValue.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathObjectValue.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathObjectValue.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathOrExpression.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathOrExpression.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathOrExpression.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathOrExpression.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathParenthesizedExpression.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathParenthesizedExpression.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathParenthesizedExpression.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathParenthesizedExpression.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathPathExpression.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathPathExpression.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathPathExpression.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathPathExpression.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathPlusExpression.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathPlusExpression.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathPlusExpression.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathPlusExpression.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathQuotedPathsList.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathQuotedPathsList.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathQuotedPathsList.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathQuotedPathsList.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathRegexExpression.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathRegexExpression.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathRegexExpression.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathRegexExpression.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathRegexLiteral.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathRegexLiteral.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathRegexLiteral.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathRegexLiteral.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathRootSegment.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathRootSegment.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathRootSegment.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathRootSegment.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathSliceExpression.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathSliceExpression.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathSliceExpression.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathSliceExpression.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathStringLiteral.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathStringLiteral.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathStringLiteral.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathStringLiteral.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathTypes.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathTypes.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathTypes.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathTypes.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathUnaryMinusExpression.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathUnaryMinusExpression.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathUnaryMinusExpression.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathUnaryMinusExpression.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathUnaryNotExpression.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathUnaryNotExpression.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathUnaryNotExpression.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathUnaryNotExpression.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathValue.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathValue.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathValue.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathValue.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathVisitor.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathVisitor.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathVisitor.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathVisitor.java diff --git a/json/gen/com/intellij/jsonpath/psi/JsonPathWildcardSegment.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathWildcardSegment.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/JsonPathWildcardSegment.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/JsonPathWildcardSegment.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathAndExpressionImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathAndExpressionImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathAndExpressionImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathAndExpressionImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathArrayValueImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathArrayValueImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathArrayValueImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathArrayValueImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathBinaryConditionalOperatorImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathBinaryConditionalOperatorImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathBinaryConditionalOperatorImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathBinaryConditionalOperatorImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathBooleanLiteralImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathBooleanLiteralImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathBooleanLiteralImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathBooleanLiteralImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathConditionalExpressionImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathConditionalExpressionImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathConditionalExpressionImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathConditionalExpressionImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathDivideExpressionImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathDivideExpressionImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathDivideExpressionImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathDivideExpressionImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathEvalSegmentImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathEvalSegmentImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathEvalSegmentImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathEvalSegmentImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathExpressionImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathExpressionImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathExpressionImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathExpressionImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathExpressionSegmentImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathExpressionSegmentImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathExpressionSegmentImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathExpressionSegmentImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathFilterExpressionImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathFilterExpressionImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathFilterExpressionImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathFilterExpressionImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathFunctionArgsListImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathFunctionArgsListImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathFunctionArgsListImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathFunctionArgsListImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathFunctionCallImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathFunctionCallImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathFunctionCallImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathFunctionCallImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathIdImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathIdImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathIdImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathIdImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathIdSegmentImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathIdSegmentImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathIdSegmentImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathIdSegmentImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathIndexExpressionImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathIndexExpressionImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathIndexExpressionImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathIndexExpressionImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathIndexesListImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathIndexesListImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathIndexesListImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathIndexesListImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathLiteralValueImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathLiteralValueImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathLiteralValueImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathLiteralValueImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathMinusExpressionImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathMinusExpressionImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathMinusExpressionImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathMinusExpressionImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathMultiplyExpressionImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathMultiplyExpressionImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathMultiplyExpressionImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathMultiplyExpressionImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathNullLiteralImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathNullLiteralImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathNullLiteralImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathNullLiteralImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathNumberLiteralImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathNumberLiteralImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathNumberLiteralImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathNumberLiteralImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathObjectPropertyImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathObjectPropertyImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathObjectPropertyImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathObjectPropertyImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathObjectValueImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathObjectValueImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathObjectValueImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathObjectValueImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathOrExpressionImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathOrExpressionImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathOrExpressionImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathOrExpressionImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathParenthesizedExpressionImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathParenthesizedExpressionImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathParenthesizedExpressionImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathParenthesizedExpressionImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathPathExpressionImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathPathExpressionImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathPathExpressionImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathPathExpressionImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathPlusExpressionImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathPlusExpressionImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathPlusExpressionImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathPlusExpressionImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathQuotedPathsListImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathQuotedPathsListImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathQuotedPathsListImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathQuotedPathsListImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathRegexExpressionImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathRegexExpressionImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathRegexExpressionImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathRegexExpressionImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathRegexLiteralImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathRegexLiteralImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathRegexLiteralImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathRegexLiteralImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathRootSegmentImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathRootSegmentImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathRootSegmentImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathRootSegmentImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathSliceExpressionImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathSliceExpressionImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathSliceExpressionImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathSliceExpressionImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathStringLiteralImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathStringLiteralImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathStringLiteralImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathStringLiteralImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathUnaryMinusExpressionImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathUnaryMinusExpressionImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathUnaryMinusExpressionImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathUnaryMinusExpressionImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathUnaryNotExpressionImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathUnaryNotExpressionImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathUnaryNotExpressionImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathUnaryNotExpressionImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathValueImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathValueImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathValueImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathValueImpl.java diff --git a/json/gen/com/intellij/jsonpath/psi/impl/JsonPathWildcardSegmentImpl.java b/plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathWildcardSegmentImpl.java similarity index 100% rename from json/gen/com/intellij/jsonpath/psi/impl/JsonPathWildcardSegmentImpl.java rename to plugins/jsonpath/gen/com/intellij/jsonpath/psi/impl/JsonPathWildcardSegmentImpl.java diff --git a/json/src/com/intellij/jsonpath/parser/JsonPath.bnf b/plugins/jsonpath/grammar/JsonPath.bnf similarity index 100% rename from json/src/com/intellij/jsonpath/parser/JsonPath.bnf rename to plugins/jsonpath/grammar/JsonPath.bnf diff --git a/json/src/com/intellij/jsonpath/lexer/_JsonPathLexer.flex b/plugins/jsonpath/grammar/_JsonPathLexer.flex similarity index 100% rename from json/src/com/intellij/jsonpath/lexer/_JsonPathLexer.flex rename to plugins/jsonpath/grammar/_JsonPathLexer.flex diff --git a/plugins/jsonpath/intellij.jsonpath.iml b/plugins/jsonpath/intellij.jsonpath.iml new file mode 100644 index 000000000000..bc9c18e42650 --- /dev/null +++ b/plugins/jsonpath/intellij.jsonpath.iml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/jsonpath/resources/META-INF/plugin.xml b/plugins/jsonpath/resources/META-INF/plugin.xml new file mode 100644 index 000000000000..5cb1a929586b --- /dev/null +++ b/plugins/jsonpath/resources/META-INF/plugin.xml @@ -0,0 +1,64 @@ + + com.intellij.jsonpath + JSONPath + JetBrains + JavaScript Frameworks and Tools + Provides JSONPath language for injected code fragments and dedicated Evaluate JSONPath tool window.

+

Go to menu Edit - Find - Evaluate JSONPath Expression... to to evaluate expressions with a snippet or JSON file.

+ ]]> + + + + + + messages.JsonPathBundle + + + + + + + + + + + + + + + + + + + JSONPath + com.intellij.jsonpath.ui.JsonPathEvaluateIntentionAction + messages.JsonBundle + json.intention.category.name + + + + + + + + + + + + + + \ No newline at end of file diff --git a/json/resources/inspectionDescriptions/JsonPathEvaluateUnknownKey.html b/plugins/jsonpath/resources/inspectionDescriptions/JsonPathEvaluateUnknownKey.html similarity index 100% rename from json/resources/inspectionDescriptions/JsonPathEvaluateUnknownKey.html rename to plugins/jsonpath/resources/inspectionDescriptions/JsonPathEvaluateUnknownKey.html diff --git a/json/resources/inspectionDescriptions/JsonPathUnknownFunction.html b/plugins/jsonpath/resources/inspectionDescriptions/JsonPathUnknownFunction.html similarity index 100% rename from json/resources/inspectionDescriptions/JsonPathUnknownFunction.html rename to plugins/jsonpath/resources/inspectionDescriptions/JsonPathUnknownFunction.html diff --git a/json/resources/inspectionDescriptions/JsonPathUnknownOperator.html b/plugins/jsonpath/resources/inspectionDescriptions/JsonPathUnknownOperator.html similarity index 100% rename from json/resources/inspectionDescriptions/JsonPathUnknownOperator.html rename to plugins/jsonpath/resources/inspectionDescriptions/JsonPathUnknownOperator.html diff --git a/json/resources/intentionDescriptions/JsonPathEvaluateIntentionAction/after.txt.template b/plugins/jsonpath/resources/intentionDescriptions/JsonPathEvaluateIntentionAction/after.txt.template similarity index 100% rename from json/resources/intentionDescriptions/JsonPathEvaluateIntentionAction/after.txt.template rename to plugins/jsonpath/resources/intentionDescriptions/JsonPathEvaluateIntentionAction/after.txt.template diff --git a/json/resources/intentionDescriptions/JsonPathEvaluateIntentionAction/before.txt.template b/plugins/jsonpath/resources/intentionDescriptions/JsonPathEvaluateIntentionAction/before.txt.template similarity index 100% rename from json/resources/intentionDescriptions/JsonPathEvaluateIntentionAction/before.txt.template rename to plugins/jsonpath/resources/intentionDescriptions/JsonPathEvaluateIntentionAction/before.txt.template diff --git a/json/resources/intentionDescriptions/JsonPathEvaluateIntentionAction/description.html b/plugins/jsonpath/resources/intentionDescriptions/JsonPathEvaluateIntentionAction/description.html similarity index 100% rename from json/resources/intentionDescriptions/JsonPathEvaluateIntentionAction/description.html rename to plugins/jsonpath/resources/intentionDescriptions/JsonPathEvaluateIntentionAction/description.html diff --git a/plugins/jsonpath/resources/messages/JsonPathBundle.properties b/plugins/jsonpath/resources/messages/JsonPathBundle.properties new file mode 100644 index 000000000000..5c53b0023ed7 --- /dev/null +++ b/plugins/jsonpath/resources/messages/JsonPathBundle.properties @@ -0,0 +1,50 @@ +settings.display.name.jsonpath=JSONPath + +jsonpath.color.page.keyword=Keyword +jsonpath.color.page.identifier=Identifier +jsonpath.color.page.string=String +jsonpath.color.page.number=Number +jsonpath.color.page.boolean=Boolean +jsonpath.color.page.function=Function call +jsonpath.color.page.context=Context variable +jsonpath.color.page.brackets=Braces and Operators//Brackets +jsonpath.color.page.braces=Braces and Operators//Braces +jsonpath.color.page.colon=Braces and Operators//Colon +jsonpath.color.page.comma=Braces and Operators//Comma +jsonpath.color.page.dot=Braces and Operators//Dot +jsonpath.color.page.operation.sign=Braces and Operators//Operation sign +jsonpath.color.page.parentheses=Braces and Operators//Parentheses + +jsonpath.completion.key=key +jsonpath.evaluate.no.result=Evaluate expression to see result +jsonpath.toolwindow.evaluate.stripe=Evaluate JSONPath +jsonpath.toolwindow.evaluate.on.snippet=Snippet +jsonpath.toolwindow.evaluate.on.snippet.n=Snippet ({0}) +jsonpath.toolwindow.evaluate.on.file=File {0} +jsonpath.evaluate.intention=Evaluate JSONPath Expression +jsonpath.evaluate.export.result=Export Result of JSONPath Evaluate +jsonpath.evaluate.progress.export.result=Exporting JSONPath Evaluate Result + +jsonpath.evaluate.add.tab.text=New Tab +jsonpath.evaluate.input=JSON input: +jsonpath.evaluate.result=Result: + +jsonpath.evaluate.options=Options +jsonpath.evaluate.output.option=Output: +jsonpath.evaluate.output.values=Matching Values +jsonpath.evaluate.output.paths=Path Expressions + +jsonpath.evaluate.suppress.exceptions=Suppress Exceptions During Evaluate +jsonpath.evaluate.return.list=Always Return Result List +jsonpath.evaluate.nullize.missing.leaf=Return Null for Missing Leaf +jsonpath.evaluate.require.all.properties=Require All Properties +jsonpath.evaluate.file.not.found=Input file not found + +inspection.message.jsonpath.unknown.function.name=Unknown function name ''{0}'' +inspection.message.jsonpath.unknown.operator.name=Unknown operator ''{0}'' +inspection.message.jsonpath.unknown.key=Property key ''{0}'' is not defined in the source JSON document +inspection.message.jsonpath.unsupported.jayway.function=Function {0} is not supported in Jayway JSONPath implementation +inspection.message.jsonpath.unsupported.jayway.operator=Operator {0} is not supported in Jayway JSONPath implementation + +action.JsonPathEvaluateAction.text=Evaluate JSONPath Expression... +action.JsonPathExportEvaluateResultAction.text=Export Result \ No newline at end of file diff --git a/plugins/jsonpath/src/com/intellij/jsonpath/JsonPathBundle.java b/plugins/jsonpath/src/com/intellij/jsonpath/JsonPathBundle.java new file mode 100644 index 000000000000..0b0a09201cd1 --- /dev/null +++ b/plugins/jsonpath/src/com/intellij/jsonpath/JsonPathBundle.java @@ -0,0 +1,26 @@ +// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +package com.intellij.jsonpath; + +import com.intellij.DynamicBundle; +import org.jetbrains.annotations.Nls; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.PropertyKey; + +import java.util.function.Supplier; + +public final class JsonPathBundle { + public static final @NonNls String BUNDLE = "messages.JsonPathBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(JsonPathBundle.class, BUNDLE); + + private JsonPathBundle() { + } + + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + return INSTANCE.getMessage(key, params); + } + + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + return INSTANCE.getLazyMessage(key, params); + } +} \ No newline at end of file diff --git a/json/src/com/intellij/jsonpath/JsonPathColorSettingsPage.java b/plugins/jsonpath/src/com/intellij/jsonpath/JsonPathColorSettingsPage.java similarity index 54% rename from json/src/com/intellij/jsonpath/JsonPathColorSettingsPage.java rename to plugins/jsonpath/src/com/intellij/jsonpath/JsonPathColorSettingsPage.java index 3df8d946ddde..610bf40f46f4 100644 --- a/json/src/com/intellij/jsonpath/JsonPathColorSettingsPage.java +++ b/plugins/jsonpath/src/com/intellij/jsonpath/JsonPathColorSettingsPage.java @@ -2,7 +2,6 @@ package com.intellij.jsonpath; import com.intellij.icons.AllIcons; -import com.intellij.json.JsonBundle; import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.fileTypes.SyntaxHighlighter; import com.intellij.openapi.options.colors.AttributesDescriptor; @@ -19,25 +18,25 @@ import java.util.Map; final class JsonPathColorSettingsPage implements ColorSettingsPage { private final AttributesDescriptor[] myAttributesDescriptors = new AttributesDescriptor[]{ - new AttributesDescriptor(JsonBundle.message("jsonpath.color.page.keyword"), JsonPathSyntaxHighlighter.JSONPATH_KEYWORD), - new AttributesDescriptor(JsonBundle.message("jsonpath.color.page.identifier"), JsonPathSyntaxHighlighter.JSONPATH_IDENTIFIER), - new AttributesDescriptor(JsonBundle.message("jsonpath.color.page.string"), JsonPathSyntaxHighlighter.JSONPATH_STRING), - new AttributesDescriptor(JsonBundle.message("jsonpath.color.page.number"), JsonPathSyntaxHighlighter.JSONPATH_NUMBER), - new AttributesDescriptor(JsonBundle.message("jsonpath.color.page.boolean"), JsonPathSyntaxHighlighter.JSONPATH_BOOLEAN), - new AttributesDescriptor(JsonBundle.message("jsonpath.color.page.brackets"), JsonPathSyntaxHighlighter.JSONPATH_BRACKETS), - new AttributesDescriptor(JsonBundle.message("jsonpath.color.page.braces"), JsonPathSyntaxHighlighter.JSONPATH_BRACES), - new AttributesDescriptor(JsonBundle.message("jsonpath.color.page.colon"), JsonPathSyntaxHighlighter.JSONPATH_COLON), - new AttributesDescriptor(JsonBundle.message("jsonpath.color.page.comma"), JsonPathSyntaxHighlighter.JSONPATH_COMMA), - new AttributesDescriptor(JsonBundle.message("jsonpath.color.page.dot"), JsonPathSyntaxHighlighter.JSONPATH_DOT), - new AttributesDescriptor(JsonBundle.message("jsonpath.color.page.operation.sign"), JsonPathSyntaxHighlighter.JSONPATH_OPERATIONS), - new AttributesDescriptor(JsonBundle.message("jsonpath.color.page.parentheses"), JsonPathSyntaxHighlighter.JSONPATH_PARENTHESES), - new AttributesDescriptor(JsonBundle.message("jsonpath.color.page.context"), JsonPathSyntaxHighlighter.JSONPATH_CONTEXT), - new AttributesDescriptor(JsonBundle.message("jsonpath.color.page.function"), JsonPathSyntaxHighlighter.JSONPATH_FUNCTION_CALL) + new AttributesDescriptor(JsonPathBundle.message("jsonpath.color.page.keyword"), JsonPathSyntaxHighlighter.JSONPATH_KEYWORD), + new AttributesDescriptor(JsonPathBundle.message("jsonpath.color.page.identifier"), JsonPathSyntaxHighlighter.JSONPATH_IDENTIFIER), + new AttributesDescriptor(JsonPathBundle.message("jsonpath.color.page.string"), JsonPathSyntaxHighlighter.JSONPATH_STRING), + new AttributesDescriptor(JsonPathBundle.message("jsonpath.color.page.number"), JsonPathSyntaxHighlighter.JSONPATH_NUMBER), + new AttributesDescriptor(JsonPathBundle.message("jsonpath.color.page.boolean"), JsonPathSyntaxHighlighter.JSONPATH_BOOLEAN), + new AttributesDescriptor(JsonPathBundle.message("jsonpath.color.page.brackets"), JsonPathSyntaxHighlighter.JSONPATH_BRACKETS), + new AttributesDescriptor(JsonPathBundle.message("jsonpath.color.page.braces"), JsonPathSyntaxHighlighter.JSONPATH_BRACES), + new AttributesDescriptor(JsonPathBundle.message("jsonpath.color.page.colon"), JsonPathSyntaxHighlighter.JSONPATH_COLON), + new AttributesDescriptor(JsonPathBundle.message("jsonpath.color.page.comma"), JsonPathSyntaxHighlighter.JSONPATH_COMMA), + new AttributesDescriptor(JsonPathBundle.message("jsonpath.color.page.dot"), JsonPathSyntaxHighlighter.JSONPATH_DOT), + new AttributesDescriptor(JsonPathBundle.message("jsonpath.color.page.operation.sign"), JsonPathSyntaxHighlighter.JSONPATH_OPERATIONS), + new AttributesDescriptor(JsonPathBundle.message("jsonpath.color.page.parentheses"), JsonPathSyntaxHighlighter.JSONPATH_PARENTHESES), + new AttributesDescriptor(JsonPathBundle.message("jsonpath.color.page.context"), JsonPathSyntaxHighlighter.JSONPATH_CONTEXT), + new AttributesDescriptor(JsonPathBundle.message("jsonpath.color.page.function"), JsonPathSyntaxHighlighter.JSONPATH_FUNCTION_CALL) }; @Override public @NotNull @NlsContexts.ConfigurableName String getDisplayName() { - return JsonBundle.message("settings.display.name.jsonpath"); + return JsonPathBundle.message("settings.display.name.jsonpath"); } @Override diff --git a/json/src/com/intellij/jsonpath/JsonPathCompletionContributor.java b/plugins/jsonpath/src/com/intellij/jsonpath/JsonPathCompletionContributor.java similarity index 98% rename from json/src/com/intellij/jsonpath/JsonPathCompletionContributor.java rename to plugins/jsonpath/src/com/intellij/jsonpath/JsonPathCompletionContributor.java index 3391e07e82cc..b5311ce80d32 100644 --- a/json/src/com/intellij/jsonpath/JsonPathCompletionContributor.java +++ b/plugins/jsonpath/src/com/intellij/jsonpath/JsonPathCompletionContributor.java @@ -4,7 +4,6 @@ package com.intellij.jsonpath; import com.intellij.codeInsight.completion.*; import com.intellij.codeInsight.lookup.LookupElementBuilder; import com.intellij.icons.AllIcons; -import com.intellij.json.JsonBundle; import com.intellij.json.psi.JsonFile; import com.intellij.json.psi.JsonProperty; import com.intellij.json.psi.impl.JsonRecursiveElementVisitor; @@ -161,7 +160,7 @@ public final class JsonPathCompletionContributor extends CompletionContributor { result.addElement(PrioritizedLookupElement.withPriority( LookupElementBuilder.create(propertyName) .withIcon(AllIcons.Nodes.Field) - .withTypeText(JsonBundle.message("jsonpath.completion.key")), + .withTypeText(JsonPathBundle.message("jsonpath.completion.key")), 100)); } } diff --git a/json/src/com/intellij/jsonpath/JsonPathConstants.java b/plugins/jsonpath/src/com/intellij/jsonpath/JsonPathConstants.java similarity index 100% rename from json/src/com/intellij/jsonpath/JsonPathConstants.java rename to plugins/jsonpath/src/com/intellij/jsonpath/JsonPathConstants.java diff --git a/json/src/com/intellij/jsonpath/JsonPathFileType.java b/plugins/jsonpath/src/com/intellij/jsonpath/JsonPathFileType.java similarity index 89% rename from json/src/com/intellij/jsonpath/JsonPathFileType.java rename to plugins/jsonpath/src/com/intellij/jsonpath/JsonPathFileType.java index aa345b58ff32..bb7a380cb7f2 100644 --- a/json/src/com/intellij/jsonpath/JsonPathFileType.java +++ b/plugins/jsonpath/src/com/intellij/jsonpath/JsonPathFileType.java @@ -2,7 +2,6 @@ package com.intellij.jsonpath; import com.intellij.icons.AllIcons; -import com.intellij.json.JsonBundle; import com.intellij.openapi.fileTypes.LanguageFileType; import org.jetbrains.annotations.NotNull; @@ -25,7 +24,7 @@ public final class JsonPathFileType extends LanguageFileType { @NotNull @Override public String getDescription() { - return JsonBundle.message("filetype.jsonpath.description"); + return JsonPathBundle.message("filetype.jsonpath.description"); } @NotNull diff --git a/json/src/com/intellij/jsonpath/JsonPathFunctionCallAnnotator.java b/plugins/jsonpath/src/com/intellij/jsonpath/JsonPathFunctionCallAnnotator.java similarity index 100% rename from json/src/com/intellij/jsonpath/JsonPathFunctionCallAnnotator.java rename to plugins/jsonpath/src/com/intellij/jsonpath/JsonPathFunctionCallAnnotator.java diff --git a/json/src/com/intellij/jsonpath/JsonPathLanguage.java b/plugins/jsonpath/src/com/intellij/jsonpath/JsonPathLanguage.java similarity index 100% rename from json/src/com/intellij/jsonpath/JsonPathLanguage.java rename to plugins/jsonpath/src/com/intellij/jsonpath/JsonPathLanguage.java diff --git a/json/src/com/intellij/jsonpath/JsonPathPairedBraceMatcher.java b/plugins/jsonpath/src/com/intellij/jsonpath/JsonPathPairedBraceMatcher.java similarity index 100% rename from json/src/com/intellij/jsonpath/JsonPathPairedBraceMatcher.java rename to plugins/jsonpath/src/com/intellij/jsonpath/JsonPathPairedBraceMatcher.java diff --git a/json/src/com/intellij/jsonpath/JsonPathQuoteHandler.java b/plugins/jsonpath/src/com/intellij/jsonpath/JsonPathQuoteHandler.java similarity index 100% rename from json/src/com/intellij/jsonpath/JsonPathQuoteHandler.java rename to plugins/jsonpath/src/com/intellij/jsonpath/JsonPathQuoteHandler.java diff --git a/json/src/com/intellij/jsonpath/JsonPathSpellcheckerStrategy.java b/plugins/jsonpath/src/com/intellij/jsonpath/JsonPathSpellcheckerStrategy.java similarity index 100% rename from json/src/com/intellij/jsonpath/JsonPathSpellcheckerStrategy.java rename to plugins/jsonpath/src/com/intellij/jsonpath/JsonPathSpellcheckerStrategy.java diff --git a/json/src/com/intellij/jsonpath/JsonPathSyntaxHighlighter.java b/plugins/jsonpath/src/com/intellij/jsonpath/JsonPathSyntaxHighlighter.java similarity index 100% rename from json/src/com/intellij/jsonpath/JsonPathSyntaxHighlighter.java rename to plugins/jsonpath/src/com/intellij/jsonpath/JsonPathSyntaxHighlighter.java diff --git a/json/src/com/intellij/jsonpath/JsonPathSyntaxHighlighterFactory.java b/plugins/jsonpath/src/com/intellij/jsonpath/JsonPathSyntaxHighlighterFactory.java similarity index 100% rename from json/src/com/intellij/jsonpath/JsonPathSyntaxHighlighterFactory.java rename to plugins/jsonpath/src/com/intellij/jsonpath/JsonPathSyntaxHighlighterFactory.java diff --git a/json/src/com/intellij/jsonpath/inspections/JsonPathEvaluateUnknownKeyInspection.java b/plugins/jsonpath/src/com/intellij/jsonpath/inspections/JsonPathEvaluateUnknownKeyInspection.java similarity index 92% rename from json/src/com/intellij/jsonpath/inspections/JsonPathEvaluateUnknownKeyInspection.java rename to plugins/jsonpath/src/com/intellij/jsonpath/inspections/JsonPathEvaluateUnknownKeyInspection.java index 0ba715687f39..2a8e34bafec9 100644 --- a/json/src/com/intellij/jsonpath/inspections/JsonPathEvaluateUnknownKeyInspection.java +++ b/plugins/jsonpath/src/com/intellij/jsonpath/inspections/JsonPathEvaluateUnknownKeyInspection.java @@ -3,10 +3,10 @@ package com.intellij.jsonpath.inspections; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.json.JsonBundle; import com.intellij.json.psi.JsonFile; import com.intellij.json.psi.JsonProperty; import com.intellij.json.psi.impl.JsonRecursiveElementVisitor; +import com.intellij.jsonpath.JsonPathBundle; import com.intellij.jsonpath.psi.JsonPathId; import com.intellij.jsonpath.psi.JsonPathIdSegment; import com.intellij.jsonpath.psi.JsonPathVisitor; @@ -40,7 +40,7 @@ final class JsonPathEvaluateUnknownKeyInspection extends LocalInspectionTool { if (StringUtil.isNotEmpty(idString) && !allKeys.getValue().contains(idString)) { - holder.registerProblem(identifier, null, JsonBundle.message("inspection.message.jsonpath.unknown.key", idString)); + holder.registerProblem(identifier, null, JsonPathBundle.message("inspection.message.jsonpath.unknown.key", idString)); } } }; diff --git a/json/src/com/intellij/jsonpath/inspections/JsonPathUnknownFunctionInspection.java b/plugins/jsonpath/src/com/intellij/jsonpath/inspections/JsonPathUnknownFunctionInspection.java similarity index 82% rename from json/src/com/intellij/jsonpath/inspections/JsonPathUnknownFunctionInspection.java rename to plugins/jsonpath/src/com/intellij/jsonpath/inspections/JsonPathUnknownFunctionInspection.java index a244d0d5be09..025dee2123e2 100644 --- a/json/src/com/intellij/jsonpath/inspections/JsonPathUnknownFunctionInspection.java +++ b/plugins/jsonpath/src/com/intellij/jsonpath/inspections/JsonPathUnknownFunctionInspection.java @@ -4,7 +4,7 @@ package com.intellij.jsonpath.inspections; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.json.JsonBundle; +import com.intellij.jsonpath.JsonPathBundle; import com.intellij.jsonpath.JsonPathConstants; import com.intellij.jsonpath.psi.JsonPathFunctionCall; import com.intellij.jsonpath.psi.JsonPathId; @@ -28,11 +28,11 @@ public final class JsonPathUnknownFunctionInspection extends LocalInspectionTool if (!JsonPathConstants.STANDARD_FUNCTIONS.containsKey(functionName)) { boolean isEvaluateExpr = Boolean.TRUE.equals(holder.getFile().getUserData(JSON_PATH_EVALUATE_EXPRESSION_KEY)); if (isEvaluateExpr) { - holder.registerProblem(functionId, JsonBundle.message("inspection.message.jsonpath.unsupported.jayway.function", functionName), + holder.registerProblem(functionId, JsonPathBundle.message("inspection.message.jsonpath.unsupported.jayway.function", functionName), ProblemHighlightType.ERROR); } else { - holder.registerProblem(functionId, null, JsonBundle.message("inspection.message.jsonpath.unknown.function.name", functionName)); + holder.registerProblem(functionId, null, JsonPathBundle.message("inspection.message.jsonpath.unknown.function.name", functionName)); // todo Suppress for name quick fix } } diff --git a/json/src/com/intellij/jsonpath/inspections/JsonPathUnknownOperatorInspection.java b/plugins/jsonpath/src/com/intellij/jsonpath/inspections/JsonPathUnknownOperatorInspection.java similarity index 84% rename from json/src/com/intellij/jsonpath/inspections/JsonPathUnknownOperatorInspection.java rename to plugins/jsonpath/src/com/intellij/jsonpath/inspections/JsonPathUnknownOperatorInspection.java index 9365877822bb..ec777e0cc062 100644 --- a/json/src/com/intellij/jsonpath/inspections/JsonPathUnknownOperatorInspection.java +++ b/plugins/jsonpath/src/com/intellij/jsonpath/inspections/JsonPathUnknownOperatorInspection.java @@ -4,7 +4,7 @@ package com.intellij.jsonpath.inspections; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.json.JsonBundle; +import com.intellij.jsonpath.JsonPathBundle; import com.intellij.jsonpath.JsonPathConstants; import com.intellij.jsonpath.psi.JsonPathBinaryConditionalOperator; import com.intellij.jsonpath.psi.JsonPathTypes; @@ -31,11 +31,11 @@ public final class JsonPathUnknownOperatorInspection extends LocalInspectionTool if (!JsonPathConstants.STANDARD_NAMED_OPERATORS.contains(operatorName)) { boolean isEvaluateExpr = Boolean.TRUE.equals(holder.getFile().getUserData(JSON_PATH_EVALUATE_EXPRESSION_KEY)); if (isEvaluateExpr) { - holder.registerProblem(operator, JsonBundle.message("inspection.message.jsonpath.unsupported.jayway.operator", operatorName), + holder.registerProblem(operator, JsonPathBundle.message("inspection.message.jsonpath.unsupported.jayway.operator", operatorName), ProblemHighlightType.ERROR); } else { - holder.registerProblem(operator, null, JsonBundle.message("inspection.message.jsonpath.unknown.operator.name", operatorName)); + holder.registerProblem(operator, null, JsonPathBundle.message("inspection.message.jsonpath.unknown.operator.name", operatorName)); } } } diff --git a/json/src/com/intellij/jsonpath/lexer/JsonPathLexer.java b/plugins/jsonpath/src/com/intellij/jsonpath/lexer/JsonPathLexer.java similarity index 100% rename from json/src/com/intellij/jsonpath/lexer/JsonPathLexer.java rename to plugins/jsonpath/src/com/intellij/jsonpath/lexer/JsonPathLexer.java diff --git a/json/src/com/intellij/jsonpath/psi/JsonPathElementType.java b/plugins/jsonpath/src/com/intellij/jsonpath/psi/JsonPathElementType.java similarity index 100% rename from json/src/com/intellij/jsonpath/psi/JsonPathElementType.java rename to plugins/jsonpath/src/com/intellij/jsonpath/psi/JsonPathElementType.java diff --git a/json/src/com/intellij/jsonpath/psi/JsonPathFile.java b/plugins/jsonpath/src/com/intellij/jsonpath/psi/JsonPathFile.java similarity index 100% rename from json/src/com/intellij/jsonpath/psi/JsonPathFile.java rename to plugins/jsonpath/src/com/intellij/jsonpath/psi/JsonPathFile.java diff --git a/json/src/com/intellij/jsonpath/psi/JsonPathParserDefinition.java b/plugins/jsonpath/src/com/intellij/jsonpath/psi/JsonPathParserDefinition.java similarity index 100% rename from json/src/com/intellij/jsonpath/psi/JsonPathParserDefinition.java rename to plugins/jsonpath/src/com/intellij/jsonpath/psi/JsonPathParserDefinition.java diff --git a/json/src/com/intellij/jsonpath/psi/JsonPathPsiUtils.java b/plugins/jsonpath/src/com/intellij/jsonpath/psi/JsonPathPsiUtils.java similarity index 100% rename from json/src/com/intellij/jsonpath/psi/JsonPathPsiUtils.java rename to plugins/jsonpath/src/com/intellij/jsonpath/psi/JsonPathPsiUtils.java diff --git a/json/src/com/intellij/jsonpath/psi/JsonPathRecursiveElementVisitor.java b/plugins/jsonpath/src/com/intellij/jsonpath/psi/JsonPathRecursiveElementVisitor.java similarity index 100% rename from json/src/com/intellij/jsonpath/psi/JsonPathRecursiveElementVisitor.java rename to plugins/jsonpath/src/com/intellij/jsonpath/psi/JsonPathRecursiveElementVisitor.java diff --git a/json/src/com/intellij/jsonpath/psi/JsonPathStringLiteralMixin.java b/plugins/jsonpath/src/com/intellij/jsonpath/psi/JsonPathStringLiteralMixin.java similarity index 100% rename from json/src/com/intellij/jsonpath/psi/JsonPathStringLiteralMixin.java rename to plugins/jsonpath/src/com/intellij/jsonpath/psi/JsonPathStringLiteralMixin.java diff --git a/json/src/com/intellij/jsonpath/psi/JsonPathTokenSets.java b/plugins/jsonpath/src/com/intellij/jsonpath/psi/JsonPathTokenSets.java similarity index 100% rename from json/src/com/intellij/jsonpath/psi/JsonPathTokenSets.java rename to plugins/jsonpath/src/com/intellij/jsonpath/psi/JsonPathTokenSets.java diff --git a/json/src/com/intellij/jsonpath/psi/JsonPathTokenType.java b/plugins/jsonpath/src/com/intellij/jsonpath/psi/JsonPathTokenType.java similarity index 100% rename from json/src/com/intellij/jsonpath/psi/JsonPathTokenType.java rename to plugins/jsonpath/src/com/intellij/jsonpath/psi/JsonPathTokenType.java diff --git a/json/src/com/intellij/jsonpath/ui/JsonPathEvaluateAction.kt b/plugins/jsonpath/src/com/intellij/jsonpath/ui/JsonPathEvaluateAction.kt similarity index 100% rename from json/src/com/intellij/jsonpath/ui/JsonPathEvaluateAction.kt rename to plugins/jsonpath/src/com/intellij/jsonpath/ui/JsonPathEvaluateAction.kt diff --git a/json/src/com/intellij/jsonpath/ui/JsonPathEvaluateFileView.kt b/plugins/jsonpath/src/com/intellij/jsonpath/ui/JsonPathEvaluateFileView.kt similarity index 100% rename from json/src/com/intellij/jsonpath/ui/JsonPathEvaluateFileView.kt rename to plugins/jsonpath/src/com/intellij/jsonpath/ui/JsonPathEvaluateFileView.kt diff --git a/json/src/com/intellij/jsonpath/ui/JsonPathEvaluateIntentionAction.kt b/plugins/jsonpath/src/com/intellij/jsonpath/ui/JsonPathEvaluateIntentionAction.kt similarity index 92% rename from json/src/com/intellij/jsonpath/ui/JsonPathEvaluateIntentionAction.kt rename to plugins/jsonpath/src/com/intellij/jsonpath/ui/JsonPathEvaluateIntentionAction.kt index 2d14367c3b3e..357523f3343c 100644 --- a/json/src/com/intellij/jsonpath/ui/JsonPathEvaluateIntentionAction.kt +++ b/plugins/jsonpath/src/com/intellij/jsonpath/ui/JsonPathEvaluateIntentionAction.kt @@ -4,7 +4,7 @@ package com.intellij.jsonpath.ui import com.intellij.codeInsight.intention.AbstractIntentionAction import com.intellij.codeInsight.intention.HighPriorityAction import com.intellij.icons.AllIcons -import com.intellij.json.JsonBundle +import com.intellij.jsonpath.JsonPathBundle import com.intellij.jsonpath.JsonPathLanguage import com.intellij.jsonpath.ui.JsonPathEvaluateManager.Companion.JSON_PATH_EVALUATE_EXPRESSION_KEY import com.intellij.lang.injection.InjectedLanguageManager @@ -15,7 +15,7 @@ import com.intellij.psi.PsiFile import javax.swing.Icon internal class JsonPathEvaluateIntentionAction : AbstractIntentionAction(), HighPriorityAction, Iconable { - override fun getText(): String = JsonBundle.message("jsonpath.evaluate.intention") + override fun getText(): String = JsonPathBundle.message("jsonpath.evaluate.intention") override fun invoke(project: Project, editor: Editor?, file: PsiFile?) { if (file == null) return diff --git a/json/src/com/intellij/jsonpath/ui/JsonPathEvaluateManager.kt b/plugins/jsonpath/src/com/intellij/jsonpath/ui/JsonPathEvaluateManager.kt similarity index 88% rename from json/src/com/intellij/jsonpath/ui/JsonPathEvaluateManager.kt rename to plugins/jsonpath/src/com/intellij/jsonpath/ui/JsonPathEvaluateManager.kt index 7a8ca2ef6161..142c1bf766c8 100644 --- a/json/src/com/intellij/jsonpath/ui/JsonPathEvaluateManager.kt +++ b/plugins/jsonpath/src/com/intellij/jsonpath/ui/JsonPathEvaluateManager.kt @@ -3,8 +3,8 @@ package com.intellij.jsonpath.ui import com.intellij.icons.AllIcons import com.intellij.ide.impl.ContentManagerWatcher -import com.intellij.json.JsonBundle import com.intellij.json.psi.JsonFile +import com.intellij.jsonpath.JsonPathBundle import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.components.Service import com.intellij.openapi.project.DumbAwareAction @@ -58,7 +58,7 @@ class JsonPathEvaluateManager internal constructor(private val project: Project) val newView = JsonPathEvaluateFileView(project, file) val newContent = cm.factory.createContent(newView.component, - JsonBundle.message("jsonpath.toolwindow.evaluate.on.file", file.name), + JsonPathBundle.message("jsonpath.toolwindow.evaluate.on.file", file.name), false) newContent.isCloseable = true newContent.isPinnable = true @@ -76,7 +76,7 @@ class JsonPathEvaluateManager internal constructor(private val project: Project) if (toolWindow == null) { toolWindow = registerToolwindow(toolWindowManager) (toolWindow as? ToolWindowEx)?.setTabActions( - object : DumbAwareAction(JsonBundle.message("jsonpath.evaluate.add.tab.text"), null, AllIcons.General.Add) { + object : DumbAwareAction(JsonPathBundle.message("jsonpath.evaluate.add.tab.text"), null, AllIcons.General.Add) { override fun actionPerformed(e: AnActionEvent) { val (content, _) = addSnippetTab(toolWindow.contentManager) toolWindow.contentManager.setSelectedContent(content, true) @@ -94,7 +94,7 @@ class JsonPathEvaluateManager internal constructor(private val project: Project) anchor = ToolWindowAnchor.RIGHT, component = null, icon = AllIcons.Toolwindows.ToolWindowJsonPath, - stripeTitle = JsonBundle.messagePointer("jsonpath.toolwindow.evaluate.stripe") + stripeTitle = JsonPathBundle.messagePointer("jsonpath.toolwindow.evaluate.stripe") ) ) ContentManagerWatcher.watchContentManager(toolWindow, toolWindow.contentManager) @@ -113,16 +113,16 @@ class JsonPathEvaluateManager internal constructor(private val project: Project) @NlsContexts.TabTitle private fun findNextSnippetTitle(cm: ContentManager): @NlsContexts.TabTitle String { - val defaultTitle = JsonBundle.message("jsonpath.toolwindow.evaluate.on.snippet") + val defaultTitle = JsonPathBundle.message("jsonpath.toolwindow.evaluate.on.snippet") if (cm.contents.none { it.tabName == defaultTitle }) { return defaultTitle } var index = 2 - while (cm.contents.any { it.tabName == JsonBundle.message("jsonpath.toolwindow.evaluate.on.snippet.n", index) }) { + while (cm.contents.any { it.tabName == JsonPathBundle.message("jsonpath.toolwindow.evaluate.on.snippet.n", index) }) { index++ } - return JsonBundle.message("jsonpath.toolwindow.evaluate.on.snippet.n", index) + return JsonPathBundle.message("jsonpath.toolwindow.evaluate.on.snippet.n", index) } companion object { diff --git a/json/src/com/intellij/jsonpath/ui/JsonPathEvaluateSnippetView.kt b/plugins/jsonpath/src/com/intellij/jsonpath/ui/JsonPathEvaluateSnippetView.kt similarity index 96% rename from json/src/com/intellij/jsonpath/ui/JsonPathEvaluateSnippetView.kt rename to plugins/jsonpath/src/com/intellij/jsonpath/ui/JsonPathEvaluateSnippetView.kt index 9c24e3ab9130..b66f595d97a2 100644 --- a/json/src/com/intellij/jsonpath/ui/JsonPathEvaluateSnippetView.kt +++ b/plugins/jsonpath/src/com/intellij/jsonpath/ui/JsonPathEvaluateSnippetView.kt @@ -1,8 +1,8 @@ // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.jsonpath.ui -import com.intellij.json.JsonBundle import com.intellij.json.psi.JsonFile +import com.intellij.jsonpath.JsonPathBundle import com.intellij.openapi.application.WriteAction import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.EditorFactory @@ -34,7 +34,7 @@ internal class JsonPathEvaluateSnippetView(project: Project) : JsonPathEvaluateV sourcePanel.addToTop(searchWrapper) val sourceWrapper = BorderLayoutPanel() - val sourceLabel = JBLabel(JsonBundle.message("jsonpath.evaluate.input")) + val sourceLabel = JBLabel(JsonPathBundle.message("jsonpath.evaluate.input")) sourceLabel.border = JBUI.Borders.empty(3, 6) sourceWrapper.addToTop(sourceLabel) sourceWrapper.addToCenter(sourceEditor.component) diff --git a/json/src/com/intellij/jsonpath/ui/JsonPathEvaluateView.kt b/plugins/jsonpath/src/com/intellij/jsonpath/ui/JsonPathEvaluateView.kt similarity index 89% rename from json/src/com/intellij/jsonpath/ui/JsonPathEvaluateView.kt rename to plugins/jsonpath/src/com/intellij/jsonpath/ui/JsonPathEvaluateView.kt index 58703a6b86c0..346507b9f557 100644 --- a/json/src/com/intellij/jsonpath/ui/JsonPathEvaluateView.kt +++ b/plugins/jsonpath/src/com/intellij/jsonpath/ui/JsonPathEvaluateView.kt @@ -7,9 +7,9 @@ import com.intellij.find.FindBundle import com.intellij.icons.AllIcons import com.intellij.ide.DataManager import com.intellij.ide.util.PropertiesComponent -import com.intellij.json.JsonBundle import com.intellij.json.JsonFileType import com.intellij.json.psi.JsonFile +import com.intellij.jsonpath.JsonPathBundle import com.intellij.jsonpath.JsonPathFileType import com.intellij.jsonpath.ui.JsonPathEvaluateManager.Companion.JSON_PATH_EVALUATE_EXPRESSION_KEY import com.intellij.jsonpath.ui.JsonPathEvaluateManager.Companion.JSON_PATH_EVALUATE_HISTORY @@ -60,14 +60,12 @@ internal abstract class JsonPathEvaluateView(protected val project: Project) : S companion object { init { Configuration.setDefaults(object : Configuration.Defaults { - private val jsonProvider = JacksonJsonProvider() - private val mappingProvider = JacksonMappingProvider() + private val jsonProvider: JacksonJsonProvider = JacksonJsonProvider() + private val mappingProvider: JacksonMappingProvider = JacksonMappingProvider() - override fun jsonProvider() = jsonProvider - - override fun mappingProvider() = mappingProvider - - override fun options() = EnumSet.noneOf(Option::class.java) + override fun jsonProvider(): JacksonJsonProvider = jsonProvider + override fun mappingProvider(): JacksonMappingProvider = mappingProvider + override fun options(): EnumSet