From 2d669c5fc9ee272d58b3d9eb0421e9555a411a4e Mon Sep 17 00:00:00 2001
From: Nikita Katkov <nikita.katkov@jetbrains.com>
Date: Thu, 13 Mar 2025 16:36:50 +0100
Subject: [PATCH] [json + remdev] IJPL-176240 Move classes that describe shared
 functionality to the intellij.json module (classes are left in the root
 module to reduce the changes surface caused by refactorings since almost
 everything depends on json)

GitOrigin-RevId: 4cceb1bf37f4e1163a5306bfda2bed15995bbabd
---
 .idea/modules.xml                                                | 1 +
 json/{split => }/BUILD.bazel                                     | 0
 json/{split => }/gen/com/intellij/json/JsonElementTypes.java     | 0
 json/{split => }/gen/com/intellij/json/JsonParser.java           | 0
 json/{split => }/gen/com/intellij/json/_JsonLexer.java           | 0
 json/{split => }/gen/com/intellij/json/json5/_Json5Lexer.java    | 0
 json/{split => }/gen/com/intellij/json/psi/JsonArray.java        | 0
 .../gen/com/intellij/json/psi/JsonBooleanLiteral.java            | 0
 json/{split => }/gen/com/intellij/json/psi/JsonContainer.java    | 0
 .../gen/com/intellij/json/psi/JsonElementVisitor.java            | 0
 json/{split => }/gen/com/intellij/json/psi/JsonLiteral.java      | 0
 json/{split => }/gen/com/intellij/json/psi/JsonNullLiteral.java  | 0
 .../{split => }/gen/com/intellij/json/psi/JsonNumberLiteral.java | 0
 json/{split => }/gen/com/intellij/json/psi/JsonObject.java       | 0
 json/{split => }/gen/com/intellij/json/psi/JsonProperty.java     | 0
 .../gen/com/intellij/json/psi/JsonReferenceExpression.java       | 0
 .../{split => }/gen/com/intellij/json/psi/JsonStringLiteral.java | 0
 json/{split => }/gen/com/intellij/json/psi/JsonValue.java        | 0
 .../gen/com/intellij/json/psi/impl/JsonArrayImpl.java            | 0
 .../gen/com/intellij/json/psi/impl/JsonBooleanLiteralImpl.java   | 0
 .../gen/com/intellij/json/psi/impl/JsonContainerImpl.java        | 0
 .../gen/com/intellij/json/psi/impl/JsonLiteralImpl.java          | 0
 .../gen/com/intellij/json/psi/impl/JsonNullLiteralImpl.java      | 0
 .../gen/com/intellij/json/psi/impl/JsonNumberLiteralImpl.java    | 0
 .../gen/com/intellij/json/psi/impl/JsonObjectImpl.java           | 0
 .../gen/com/intellij/json/psi/impl/JsonPropertyImpl.java         | 0
 .../com/intellij/json/psi/impl/JsonReferenceExpressionImpl.java  | 0
 .../gen/com/intellij/json/psi/impl/JsonStringLiteralImpl.java    | 0
 .../gen/com/intellij/json/psi/impl/JsonValueImpl.java            | 0
 json/{split => }/intellij.json.iml                               | 0
 json/{split => }/resources/intellij.json.xml                     | 0
 json/{split => }/resources/messages/JsonBundle.properties        | 0
 json/{split => }/src/com/intellij/json/JsonBraceMatcher.java     | 0
 json/{split => }/src/com/intellij/json/JsonBundle.java           | 0
 json/{split => }/src/com/intellij/json/JsonDialectUtil.java      | 0
 json/{split => }/src/com/intellij/json/JsonElementType.java      | 0
 json/{split => }/src/com/intellij/json/JsonFileType.java         | 0
 json/{split => }/src/com/intellij/json/JsonLanguage.java         | 0
 json/{split => }/src/com/intellij/json/JsonLexer.java            | 0
 json/{split => }/src/com/intellij/json/JsonParserDefinition.java | 0
 json/{split => }/src/com/intellij/json/JsonQuoteHandler.java     | 0
 json/{split => }/src/com/intellij/json/JsonTokenSets.java        | 0
 json/{split => }/src/com/intellij/json/JsonTokenType.java        | 0
 json/{split => }/src/com/intellij/json/JsonUtil.java             | 0
 json/{split => }/src/com/intellij/json/_JsonLexer.flex           | 0
 .../src/com/intellij/json/codeinsight/JsonLiteralAnnotator.java  | 0
 .../src/com/intellij/json/codeinsight/JsonLiteralChecker.java    | 0
 .../intellij/json/codeinsight/StandardJsonLiteralChecker.java    | 0
 json/{split => }/src/com/intellij/json/editor/JsonCommenter.java | 0
 .../src/com/intellij/json/editor/JsonCopyPastePostProcessor.java | 0
 .../src/com/intellij/json/editor/JsonCopyPasteProcessor.java     | 0
 .../src/com/intellij/json/editor/JsonEditorOptions.java          | 0
 .../src/com/intellij/json/editor/JsonEnterHandler.java           | 0
 .../src/com/intellij/json/editor/JsonFocusModeProvider.java      | 0
 .../src/com/intellij/json/editor/JsonSmartKeysConfigurable.kt    | 0
 .../src/com/intellij/json/editor/JsonTypedHandler.java           | 0
 .../src/com/intellij/json/editor/folding/JsonFoldingBuilder.java | 0
 .../src/com/intellij/json/editor/lineMover/JsonLineMover.java    | 0
 .../json/editor/selection/JsonStringLiteralSelectionHandler.java | 0
 .../intellij/json/editor/smartEnter/JsonSmartEnterProcessor.java | 0
 json/{split => }/src/com/intellij/json/formatter/JsonBlock.java  | 0
 .../src/com/intellij/json/formatter/JsonCodeStyleSettings.java   | 0
 .../intellij/json/formatter/JsonCodeStyleSettingsProvider.java   | 0
 .../com/intellij/json/formatter/JsonFormattingBuilderModel.java  | 0
 .../json/formatter/JsonLanguageCodeStyleSettingsProvider.java    | 0
 .../intellij/json/formatter/JsonLineWrapPositionStrategy.java    | 0
 .../com/intellij/json/formatter/JsonTrailingCommaRemover.java    | 0
 .../src/com/intellij/json/highlighting/JsonColorsPage.java       | 0
 .../com/intellij/json/highlighting/JsonHighlightingLexer.java    | 0
 .../com/intellij/json/highlighting/JsonStringLiteralLexer.java   | 0
 .../intellij/json/highlighting/JsonSyntaxHighlighterFactory.java | 0
 json/{split => }/src/com/intellij/json/json5/Json5FileType.java  | 0
 json/{split => }/src/com/intellij/json/json5/Json5Language.java  | 0
 json/{split => }/src/com/intellij/json/json5/Json5Lexer.java     | 0
 .../src/com/intellij/json/json5/Json5ParserDefinition.java       | 0
 json/{split => }/src/com/intellij/json/json5/_Json5Lexer.flex    | 0
 .../intellij/json/json5/codeinsight/Json5JsonLiteralChecker.java | 0
 .../json/json5/highlighting/Json5SyntaxHighlightingFactory.java  | 0
 .../src/com/intellij/json/jsonLines/JsonLinesFileType.kt         | 0
 .../src/com/intellij/json/jsonLines/JsonLinesLanguage.kt         | 0
 .../src/com/intellij/json/jsonLines/JsonLinesParserDefinition.kt | 0
 json/{split => }/src/com/intellij/json/psi/JsonElement.java      | 0
 .../src/com/intellij/json/psi/JsonElementGenerator.java          | 0
 json/{split => }/src/com/intellij/json/psi/JsonFile.java         | 0
 json/{split => }/src/com/intellij/json/psi/JsonParserUtil.java   | 0
 .../src/com/intellij/json/psi/JsonPsiChangeUtils.java            | 0
 json/{split => }/src/com/intellij/json/psi/JsonPsiUtil.java      | 0
 .../src/com/intellij/json/psi/JsonStringLiteralManipulator.java  | 0
 .../src/com/intellij/json/psi/impl/JSStringLiteralEscaper.java   | 0
 .../src/com/intellij/json/psi/impl/JsonElementImpl.java          | 0
 .../{split => }/src/com/intellij/json/psi/impl/JsonFileImpl.java | 0
 .../src/com/intellij/json/psi/impl/JsonLiteralMixin.java         | 0
 .../src/com/intellij/json/psi/impl/JsonObjectMixin.java          | 0
 .../src/com/intellij/json/psi/impl/JsonPropertyMixin.java        | 0
 .../com/intellij/json/psi/impl/JsonPropertyNameReference.java    | 0
 .../src/com/intellij/json/psi/impl/JsonPsiImplUtils.java         | 0
 .../com/intellij/json/psi/impl/JsonRecursiveElementVisitor.java  | 0
 .../com/intellij/json/psi/impl/JsonReferenceLiteralMixin.java    | 0
 .../src/com/intellij/json/psi/impl/JsonStringLiteralMixin.java   | 0
 .../src/com/intellij/json/psi/impl/JsonTextLiteralService.kt     | 0
 .../src/com/intellij/json/psi/impl/jsonArrayPresentationUtils.kt | 0
 .../json/split/JsonCodeStyleSettingsCustomDataSynchronizer.kt    | 0
 .../com/intellij/json/split/jsonBackendExtensionSuppressor.kt    | 0
 103 files changed, 1 insertion(+)
 rename json/{split => }/BUILD.bazel (100%)
 rename json/{split => }/gen/com/intellij/json/JsonElementTypes.java (100%)
 rename json/{split => }/gen/com/intellij/json/JsonParser.java (100%)
 rename json/{split => }/gen/com/intellij/json/_JsonLexer.java (100%)
 rename json/{split => }/gen/com/intellij/json/json5/_Json5Lexer.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/JsonArray.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/JsonBooleanLiteral.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/JsonContainer.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/JsonElementVisitor.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/JsonLiteral.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/JsonNullLiteral.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/JsonNumberLiteral.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/JsonObject.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/JsonProperty.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/JsonReferenceExpression.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/JsonStringLiteral.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/JsonValue.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/impl/JsonArrayImpl.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/impl/JsonBooleanLiteralImpl.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/impl/JsonContainerImpl.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/impl/JsonLiteralImpl.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/impl/JsonNullLiteralImpl.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/impl/JsonNumberLiteralImpl.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/impl/JsonObjectImpl.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/impl/JsonPropertyImpl.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/impl/JsonReferenceExpressionImpl.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/impl/JsonStringLiteralImpl.java (100%)
 rename json/{split => }/gen/com/intellij/json/psi/impl/JsonValueImpl.java (100%)
 rename json/{split => }/intellij.json.iml (100%)
 rename json/{split => }/resources/intellij.json.xml (100%)
 rename json/{split => }/resources/messages/JsonBundle.properties (100%)
 rename json/{split => }/src/com/intellij/json/JsonBraceMatcher.java (100%)
 rename json/{split => }/src/com/intellij/json/JsonBundle.java (100%)
 rename json/{split => }/src/com/intellij/json/JsonDialectUtil.java (100%)
 rename json/{split => }/src/com/intellij/json/JsonElementType.java (100%)
 rename json/{split => }/src/com/intellij/json/JsonFileType.java (100%)
 rename json/{split => }/src/com/intellij/json/JsonLanguage.java (100%)
 rename json/{split => }/src/com/intellij/json/JsonLexer.java (100%)
 rename json/{split => }/src/com/intellij/json/JsonParserDefinition.java (100%)
 rename json/{split => }/src/com/intellij/json/JsonQuoteHandler.java (100%)
 rename json/{split => }/src/com/intellij/json/JsonTokenSets.java (100%)
 rename json/{split => }/src/com/intellij/json/JsonTokenType.java (100%)
 rename json/{split => }/src/com/intellij/json/JsonUtil.java (100%)
 rename json/{split => }/src/com/intellij/json/_JsonLexer.flex (100%)
 rename json/{split => }/src/com/intellij/json/codeinsight/JsonLiteralAnnotator.java (100%)
 rename json/{split => }/src/com/intellij/json/codeinsight/JsonLiteralChecker.java (100%)
 rename json/{split => }/src/com/intellij/json/codeinsight/StandardJsonLiteralChecker.java (100%)
 rename json/{split => }/src/com/intellij/json/editor/JsonCommenter.java (100%)
 rename json/{split => }/src/com/intellij/json/editor/JsonCopyPastePostProcessor.java (100%)
 rename json/{split => }/src/com/intellij/json/editor/JsonCopyPasteProcessor.java (100%)
 rename json/{split => }/src/com/intellij/json/editor/JsonEditorOptions.java (100%)
 rename json/{split => }/src/com/intellij/json/editor/JsonEnterHandler.java (100%)
 rename json/{split => }/src/com/intellij/json/editor/JsonFocusModeProvider.java (100%)
 rename json/{split => }/src/com/intellij/json/editor/JsonSmartKeysConfigurable.kt (100%)
 rename json/{split => }/src/com/intellij/json/editor/JsonTypedHandler.java (100%)
 rename json/{split => }/src/com/intellij/json/editor/folding/JsonFoldingBuilder.java (100%)
 rename json/{split => }/src/com/intellij/json/editor/lineMover/JsonLineMover.java (100%)
 rename json/{split => }/src/com/intellij/json/editor/selection/JsonStringLiteralSelectionHandler.java (100%)
 rename json/{split => }/src/com/intellij/json/editor/smartEnter/JsonSmartEnterProcessor.java (100%)
 rename json/{split => }/src/com/intellij/json/formatter/JsonBlock.java (100%)
 rename json/{split => }/src/com/intellij/json/formatter/JsonCodeStyleSettings.java (100%)
 rename json/{split => }/src/com/intellij/json/formatter/JsonCodeStyleSettingsProvider.java (100%)
 rename json/{split => }/src/com/intellij/json/formatter/JsonFormattingBuilderModel.java (100%)
 rename json/{split => }/src/com/intellij/json/formatter/JsonLanguageCodeStyleSettingsProvider.java (100%)
 rename json/{split => }/src/com/intellij/json/formatter/JsonLineWrapPositionStrategy.java (100%)
 rename json/{split => }/src/com/intellij/json/formatter/JsonTrailingCommaRemover.java (100%)
 rename json/{split => }/src/com/intellij/json/highlighting/JsonColorsPage.java (100%)
 rename json/{split => }/src/com/intellij/json/highlighting/JsonHighlightingLexer.java (100%)
 rename json/{split => }/src/com/intellij/json/highlighting/JsonStringLiteralLexer.java (100%)
 rename json/{split => }/src/com/intellij/json/highlighting/JsonSyntaxHighlighterFactory.java (100%)
 rename json/{split => }/src/com/intellij/json/json5/Json5FileType.java (100%)
 rename json/{split => }/src/com/intellij/json/json5/Json5Language.java (100%)
 rename json/{split => }/src/com/intellij/json/json5/Json5Lexer.java (100%)
 rename json/{split => }/src/com/intellij/json/json5/Json5ParserDefinition.java (100%)
 rename json/{split => }/src/com/intellij/json/json5/_Json5Lexer.flex (100%)
 rename json/{split => }/src/com/intellij/json/json5/codeinsight/Json5JsonLiteralChecker.java (100%)
 rename json/{split => }/src/com/intellij/json/json5/highlighting/Json5SyntaxHighlightingFactory.java (100%)
 rename json/{split => }/src/com/intellij/json/jsonLines/JsonLinesFileType.kt (100%)
 rename json/{split => }/src/com/intellij/json/jsonLines/JsonLinesLanguage.kt (100%)
 rename json/{split => }/src/com/intellij/json/jsonLines/JsonLinesParserDefinition.kt (100%)
 rename json/{split => }/src/com/intellij/json/psi/JsonElement.java (100%)
 rename json/{split => }/src/com/intellij/json/psi/JsonElementGenerator.java (100%)
 rename json/{split => }/src/com/intellij/json/psi/JsonFile.java (100%)
 rename json/{split => }/src/com/intellij/json/psi/JsonParserUtil.java (100%)
 rename json/{split => }/src/com/intellij/json/psi/JsonPsiChangeUtils.java (100%)
 rename json/{split => }/src/com/intellij/json/psi/JsonPsiUtil.java (100%)
 rename json/{split => }/src/com/intellij/json/psi/JsonStringLiteralManipulator.java (100%)
 rename json/{split => }/src/com/intellij/json/psi/impl/JSStringLiteralEscaper.java (100%)
 rename json/{split => }/src/com/intellij/json/psi/impl/JsonElementImpl.java (100%)
 rename json/{split => }/src/com/intellij/json/psi/impl/JsonFileImpl.java (100%)
 rename json/{split => }/src/com/intellij/json/psi/impl/JsonLiteralMixin.java (100%)
 rename json/{split => }/src/com/intellij/json/psi/impl/JsonObjectMixin.java (100%)
 rename json/{split => }/src/com/intellij/json/psi/impl/JsonPropertyMixin.java (100%)
 rename json/{split => }/src/com/intellij/json/psi/impl/JsonPropertyNameReference.java (100%)
 rename json/{split => }/src/com/intellij/json/psi/impl/JsonPsiImplUtils.java (100%)
 rename json/{split => }/src/com/intellij/json/psi/impl/JsonRecursiveElementVisitor.java (100%)
 rename json/{split => }/src/com/intellij/json/psi/impl/JsonReferenceLiteralMixin.java (100%)
 rename json/{split => }/src/com/intellij/json/psi/impl/JsonStringLiteralMixin.java (100%)
 rename json/{split => }/src/com/intellij/json/psi/impl/JsonTextLiteralService.kt (100%)
 rename json/{split => }/src/com/intellij/json/psi/impl/jsonArrayPresentationUtils.kt (100%)
 rename json/{split => }/src/com/intellij/json/split/JsonCodeStyleSettingsCustomDataSynchronizer.kt (100%)
 rename json/{split => }/src/com/intellij/json/split/jsonBackendExtensionSuppressor.kt (100%)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 69324cfb42cd..bab11f7494aa 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -544,6 +544,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/javaFX/sceneBuilder/intellij.javaFX.sceneBuilder.iml" filepath="$PROJECT_DIR$/plugins/javaFX/sceneBuilder/intellij.javaFX.sceneBuilder.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/script-debugger/protocol/protocol-reader/intellij.javascript.protocolReader.iml" filepath="$PROJECT_DIR$/platform/script-debugger/protocol/protocol-reader/intellij.javascript.protocolReader.iml" />
       <module fileurl="file://$PROJECT_DIR$/json/intellij.json.iml" filepath="$PROJECT_DIR$/json/intellij.json.iml" />
+      <module fileurl="file://$PROJECT_DIR$/json/backend/intellij.json.backend.iml" filepath="$PROJECT_DIR$/json/backend/intellij.json.backend.iml" />
       <module fileurl="file://$PROJECT_DIR$/json/split/intellij.json.split.iml" filepath="$PROJECT_DIR$/json/split/intellij.json.split.iml" />
       <module fileurl="file://$PROJECT_DIR$/json/tests/intellij.json.tests.iml" filepath="$PROJECT_DIR$/json/tests/intellij.json.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/jsonpath/intellij.jsonpath.iml" filepath="$PROJECT_DIR$/plugins/jsonpath/intellij.jsonpath.iml" />
diff --git a/json/split/BUILD.bazel b/json/BUILD.bazel
similarity index 100%
rename from json/split/BUILD.bazel
rename to json/BUILD.bazel
diff --git a/json/split/gen/com/intellij/json/JsonElementTypes.java b/json/gen/com/intellij/json/JsonElementTypes.java
similarity index 100%
rename from json/split/gen/com/intellij/json/JsonElementTypes.java
rename to json/gen/com/intellij/json/JsonElementTypes.java
diff --git a/json/split/gen/com/intellij/json/JsonParser.java b/json/gen/com/intellij/json/JsonParser.java
similarity index 100%
rename from json/split/gen/com/intellij/json/JsonParser.java
rename to json/gen/com/intellij/json/JsonParser.java
diff --git a/json/split/gen/com/intellij/json/_JsonLexer.java b/json/gen/com/intellij/json/_JsonLexer.java
similarity index 100%
rename from json/split/gen/com/intellij/json/_JsonLexer.java
rename to json/gen/com/intellij/json/_JsonLexer.java
diff --git a/json/split/gen/com/intellij/json/json5/_Json5Lexer.java b/json/gen/com/intellij/json/json5/_Json5Lexer.java
similarity index 100%
rename from json/split/gen/com/intellij/json/json5/_Json5Lexer.java
rename to json/gen/com/intellij/json/json5/_Json5Lexer.java
diff --git a/json/split/gen/com/intellij/json/psi/JsonArray.java b/json/gen/com/intellij/json/psi/JsonArray.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/JsonArray.java
rename to json/gen/com/intellij/json/psi/JsonArray.java
diff --git a/json/split/gen/com/intellij/json/psi/JsonBooleanLiteral.java b/json/gen/com/intellij/json/psi/JsonBooleanLiteral.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/JsonBooleanLiteral.java
rename to json/gen/com/intellij/json/psi/JsonBooleanLiteral.java
diff --git a/json/split/gen/com/intellij/json/psi/JsonContainer.java b/json/gen/com/intellij/json/psi/JsonContainer.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/JsonContainer.java
rename to json/gen/com/intellij/json/psi/JsonContainer.java
diff --git a/json/split/gen/com/intellij/json/psi/JsonElementVisitor.java b/json/gen/com/intellij/json/psi/JsonElementVisitor.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/JsonElementVisitor.java
rename to json/gen/com/intellij/json/psi/JsonElementVisitor.java
diff --git a/json/split/gen/com/intellij/json/psi/JsonLiteral.java b/json/gen/com/intellij/json/psi/JsonLiteral.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/JsonLiteral.java
rename to json/gen/com/intellij/json/psi/JsonLiteral.java
diff --git a/json/split/gen/com/intellij/json/psi/JsonNullLiteral.java b/json/gen/com/intellij/json/psi/JsonNullLiteral.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/JsonNullLiteral.java
rename to json/gen/com/intellij/json/psi/JsonNullLiteral.java
diff --git a/json/split/gen/com/intellij/json/psi/JsonNumberLiteral.java b/json/gen/com/intellij/json/psi/JsonNumberLiteral.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/JsonNumberLiteral.java
rename to json/gen/com/intellij/json/psi/JsonNumberLiteral.java
diff --git a/json/split/gen/com/intellij/json/psi/JsonObject.java b/json/gen/com/intellij/json/psi/JsonObject.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/JsonObject.java
rename to json/gen/com/intellij/json/psi/JsonObject.java
diff --git a/json/split/gen/com/intellij/json/psi/JsonProperty.java b/json/gen/com/intellij/json/psi/JsonProperty.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/JsonProperty.java
rename to json/gen/com/intellij/json/psi/JsonProperty.java
diff --git a/json/split/gen/com/intellij/json/psi/JsonReferenceExpression.java b/json/gen/com/intellij/json/psi/JsonReferenceExpression.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/JsonReferenceExpression.java
rename to json/gen/com/intellij/json/psi/JsonReferenceExpression.java
diff --git a/json/split/gen/com/intellij/json/psi/JsonStringLiteral.java b/json/gen/com/intellij/json/psi/JsonStringLiteral.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/JsonStringLiteral.java
rename to json/gen/com/intellij/json/psi/JsonStringLiteral.java
diff --git a/json/split/gen/com/intellij/json/psi/JsonValue.java b/json/gen/com/intellij/json/psi/JsonValue.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/JsonValue.java
rename to json/gen/com/intellij/json/psi/JsonValue.java
diff --git a/json/split/gen/com/intellij/json/psi/impl/JsonArrayImpl.java b/json/gen/com/intellij/json/psi/impl/JsonArrayImpl.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/impl/JsonArrayImpl.java
rename to json/gen/com/intellij/json/psi/impl/JsonArrayImpl.java
diff --git a/json/split/gen/com/intellij/json/psi/impl/JsonBooleanLiteralImpl.java b/json/gen/com/intellij/json/psi/impl/JsonBooleanLiteralImpl.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/impl/JsonBooleanLiteralImpl.java
rename to json/gen/com/intellij/json/psi/impl/JsonBooleanLiteralImpl.java
diff --git a/json/split/gen/com/intellij/json/psi/impl/JsonContainerImpl.java b/json/gen/com/intellij/json/psi/impl/JsonContainerImpl.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/impl/JsonContainerImpl.java
rename to json/gen/com/intellij/json/psi/impl/JsonContainerImpl.java
diff --git a/json/split/gen/com/intellij/json/psi/impl/JsonLiteralImpl.java b/json/gen/com/intellij/json/psi/impl/JsonLiteralImpl.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/impl/JsonLiteralImpl.java
rename to json/gen/com/intellij/json/psi/impl/JsonLiteralImpl.java
diff --git a/json/split/gen/com/intellij/json/psi/impl/JsonNullLiteralImpl.java b/json/gen/com/intellij/json/psi/impl/JsonNullLiteralImpl.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/impl/JsonNullLiteralImpl.java
rename to json/gen/com/intellij/json/psi/impl/JsonNullLiteralImpl.java
diff --git a/json/split/gen/com/intellij/json/psi/impl/JsonNumberLiteralImpl.java b/json/gen/com/intellij/json/psi/impl/JsonNumberLiteralImpl.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/impl/JsonNumberLiteralImpl.java
rename to json/gen/com/intellij/json/psi/impl/JsonNumberLiteralImpl.java
diff --git a/json/split/gen/com/intellij/json/psi/impl/JsonObjectImpl.java b/json/gen/com/intellij/json/psi/impl/JsonObjectImpl.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/impl/JsonObjectImpl.java
rename to json/gen/com/intellij/json/psi/impl/JsonObjectImpl.java
diff --git a/json/split/gen/com/intellij/json/psi/impl/JsonPropertyImpl.java b/json/gen/com/intellij/json/psi/impl/JsonPropertyImpl.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/impl/JsonPropertyImpl.java
rename to json/gen/com/intellij/json/psi/impl/JsonPropertyImpl.java
diff --git a/json/split/gen/com/intellij/json/psi/impl/JsonReferenceExpressionImpl.java b/json/gen/com/intellij/json/psi/impl/JsonReferenceExpressionImpl.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/impl/JsonReferenceExpressionImpl.java
rename to json/gen/com/intellij/json/psi/impl/JsonReferenceExpressionImpl.java
diff --git a/json/split/gen/com/intellij/json/psi/impl/JsonStringLiteralImpl.java b/json/gen/com/intellij/json/psi/impl/JsonStringLiteralImpl.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/impl/JsonStringLiteralImpl.java
rename to json/gen/com/intellij/json/psi/impl/JsonStringLiteralImpl.java
diff --git a/json/split/gen/com/intellij/json/psi/impl/JsonValueImpl.java b/json/gen/com/intellij/json/psi/impl/JsonValueImpl.java
similarity index 100%
rename from json/split/gen/com/intellij/json/psi/impl/JsonValueImpl.java
rename to json/gen/com/intellij/json/psi/impl/JsonValueImpl.java
diff --git a/json/split/intellij.json.iml b/json/intellij.json.iml
similarity index 100%
rename from json/split/intellij.json.iml
rename to json/intellij.json.iml
diff --git a/json/split/resources/intellij.json.xml b/json/resources/intellij.json.xml
similarity index 100%
rename from json/split/resources/intellij.json.xml
rename to json/resources/intellij.json.xml
diff --git a/json/split/resources/messages/JsonBundle.properties b/json/resources/messages/JsonBundle.properties
similarity index 100%
rename from json/split/resources/messages/JsonBundle.properties
rename to json/resources/messages/JsonBundle.properties
diff --git a/json/split/src/com/intellij/json/JsonBraceMatcher.java b/json/src/com/intellij/json/JsonBraceMatcher.java
similarity index 100%
rename from json/split/src/com/intellij/json/JsonBraceMatcher.java
rename to json/src/com/intellij/json/JsonBraceMatcher.java
diff --git a/json/split/src/com/intellij/json/JsonBundle.java b/json/src/com/intellij/json/JsonBundle.java
similarity index 100%
rename from json/split/src/com/intellij/json/JsonBundle.java
rename to json/src/com/intellij/json/JsonBundle.java
diff --git a/json/split/src/com/intellij/json/JsonDialectUtil.java b/json/src/com/intellij/json/JsonDialectUtil.java
similarity index 100%
rename from json/split/src/com/intellij/json/JsonDialectUtil.java
rename to json/src/com/intellij/json/JsonDialectUtil.java
diff --git a/json/split/src/com/intellij/json/JsonElementType.java b/json/src/com/intellij/json/JsonElementType.java
similarity index 100%
rename from json/split/src/com/intellij/json/JsonElementType.java
rename to json/src/com/intellij/json/JsonElementType.java
diff --git a/json/split/src/com/intellij/json/JsonFileType.java b/json/src/com/intellij/json/JsonFileType.java
similarity index 100%
rename from json/split/src/com/intellij/json/JsonFileType.java
rename to json/src/com/intellij/json/JsonFileType.java
diff --git a/json/split/src/com/intellij/json/JsonLanguage.java b/json/src/com/intellij/json/JsonLanguage.java
similarity index 100%
rename from json/split/src/com/intellij/json/JsonLanguage.java
rename to json/src/com/intellij/json/JsonLanguage.java
diff --git a/json/split/src/com/intellij/json/JsonLexer.java b/json/src/com/intellij/json/JsonLexer.java
similarity index 100%
rename from json/split/src/com/intellij/json/JsonLexer.java
rename to json/src/com/intellij/json/JsonLexer.java
diff --git a/json/split/src/com/intellij/json/JsonParserDefinition.java b/json/src/com/intellij/json/JsonParserDefinition.java
similarity index 100%
rename from json/split/src/com/intellij/json/JsonParserDefinition.java
rename to json/src/com/intellij/json/JsonParserDefinition.java
diff --git a/json/split/src/com/intellij/json/JsonQuoteHandler.java b/json/src/com/intellij/json/JsonQuoteHandler.java
similarity index 100%
rename from json/split/src/com/intellij/json/JsonQuoteHandler.java
rename to json/src/com/intellij/json/JsonQuoteHandler.java
diff --git a/json/split/src/com/intellij/json/JsonTokenSets.java b/json/src/com/intellij/json/JsonTokenSets.java
similarity index 100%
rename from json/split/src/com/intellij/json/JsonTokenSets.java
rename to json/src/com/intellij/json/JsonTokenSets.java
diff --git a/json/split/src/com/intellij/json/JsonTokenType.java b/json/src/com/intellij/json/JsonTokenType.java
similarity index 100%
rename from json/split/src/com/intellij/json/JsonTokenType.java
rename to json/src/com/intellij/json/JsonTokenType.java
diff --git a/json/split/src/com/intellij/json/JsonUtil.java b/json/src/com/intellij/json/JsonUtil.java
similarity index 100%
rename from json/split/src/com/intellij/json/JsonUtil.java
rename to json/src/com/intellij/json/JsonUtil.java
diff --git a/json/split/src/com/intellij/json/_JsonLexer.flex b/json/src/com/intellij/json/_JsonLexer.flex
similarity index 100%
rename from json/split/src/com/intellij/json/_JsonLexer.flex
rename to json/src/com/intellij/json/_JsonLexer.flex
diff --git a/json/split/src/com/intellij/json/codeinsight/JsonLiteralAnnotator.java b/json/src/com/intellij/json/codeinsight/JsonLiteralAnnotator.java
similarity index 100%
rename from json/split/src/com/intellij/json/codeinsight/JsonLiteralAnnotator.java
rename to json/src/com/intellij/json/codeinsight/JsonLiteralAnnotator.java
diff --git a/json/split/src/com/intellij/json/codeinsight/JsonLiteralChecker.java b/json/src/com/intellij/json/codeinsight/JsonLiteralChecker.java
similarity index 100%
rename from json/split/src/com/intellij/json/codeinsight/JsonLiteralChecker.java
rename to json/src/com/intellij/json/codeinsight/JsonLiteralChecker.java
diff --git a/json/split/src/com/intellij/json/codeinsight/StandardJsonLiteralChecker.java b/json/src/com/intellij/json/codeinsight/StandardJsonLiteralChecker.java
similarity index 100%
rename from json/split/src/com/intellij/json/codeinsight/StandardJsonLiteralChecker.java
rename to json/src/com/intellij/json/codeinsight/StandardJsonLiteralChecker.java
diff --git a/json/split/src/com/intellij/json/editor/JsonCommenter.java b/json/src/com/intellij/json/editor/JsonCommenter.java
similarity index 100%
rename from json/split/src/com/intellij/json/editor/JsonCommenter.java
rename to json/src/com/intellij/json/editor/JsonCommenter.java
diff --git a/json/split/src/com/intellij/json/editor/JsonCopyPastePostProcessor.java b/json/src/com/intellij/json/editor/JsonCopyPastePostProcessor.java
similarity index 100%
rename from json/split/src/com/intellij/json/editor/JsonCopyPastePostProcessor.java
rename to json/src/com/intellij/json/editor/JsonCopyPastePostProcessor.java
diff --git a/json/split/src/com/intellij/json/editor/JsonCopyPasteProcessor.java b/json/src/com/intellij/json/editor/JsonCopyPasteProcessor.java
similarity index 100%
rename from json/split/src/com/intellij/json/editor/JsonCopyPasteProcessor.java
rename to json/src/com/intellij/json/editor/JsonCopyPasteProcessor.java
diff --git a/json/split/src/com/intellij/json/editor/JsonEditorOptions.java b/json/src/com/intellij/json/editor/JsonEditorOptions.java
similarity index 100%
rename from json/split/src/com/intellij/json/editor/JsonEditorOptions.java
rename to json/src/com/intellij/json/editor/JsonEditorOptions.java
diff --git a/json/split/src/com/intellij/json/editor/JsonEnterHandler.java b/json/src/com/intellij/json/editor/JsonEnterHandler.java
similarity index 100%
rename from json/split/src/com/intellij/json/editor/JsonEnterHandler.java
rename to json/src/com/intellij/json/editor/JsonEnterHandler.java
diff --git a/json/split/src/com/intellij/json/editor/JsonFocusModeProvider.java b/json/src/com/intellij/json/editor/JsonFocusModeProvider.java
similarity index 100%
rename from json/split/src/com/intellij/json/editor/JsonFocusModeProvider.java
rename to json/src/com/intellij/json/editor/JsonFocusModeProvider.java
diff --git a/json/split/src/com/intellij/json/editor/JsonSmartKeysConfigurable.kt b/json/src/com/intellij/json/editor/JsonSmartKeysConfigurable.kt
similarity index 100%
rename from json/split/src/com/intellij/json/editor/JsonSmartKeysConfigurable.kt
rename to json/src/com/intellij/json/editor/JsonSmartKeysConfigurable.kt
diff --git a/json/split/src/com/intellij/json/editor/JsonTypedHandler.java b/json/src/com/intellij/json/editor/JsonTypedHandler.java
similarity index 100%
rename from json/split/src/com/intellij/json/editor/JsonTypedHandler.java
rename to json/src/com/intellij/json/editor/JsonTypedHandler.java
diff --git a/json/split/src/com/intellij/json/editor/folding/JsonFoldingBuilder.java b/json/src/com/intellij/json/editor/folding/JsonFoldingBuilder.java
similarity index 100%
rename from json/split/src/com/intellij/json/editor/folding/JsonFoldingBuilder.java
rename to json/src/com/intellij/json/editor/folding/JsonFoldingBuilder.java
diff --git a/json/split/src/com/intellij/json/editor/lineMover/JsonLineMover.java b/json/src/com/intellij/json/editor/lineMover/JsonLineMover.java
similarity index 100%
rename from json/split/src/com/intellij/json/editor/lineMover/JsonLineMover.java
rename to json/src/com/intellij/json/editor/lineMover/JsonLineMover.java
diff --git a/json/split/src/com/intellij/json/editor/selection/JsonStringLiteralSelectionHandler.java b/json/src/com/intellij/json/editor/selection/JsonStringLiteralSelectionHandler.java
similarity index 100%
rename from json/split/src/com/intellij/json/editor/selection/JsonStringLiteralSelectionHandler.java
rename to json/src/com/intellij/json/editor/selection/JsonStringLiteralSelectionHandler.java
diff --git a/json/split/src/com/intellij/json/editor/smartEnter/JsonSmartEnterProcessor.java b/json/src/com/intellij/json/editor/smartEnter/JsonSmartEnterProcessor.java
similarity index 100%
rename from json/split/src/com/intellij/json/editor/smartEnter/JsonSmartEnterProcessor.java
rename to json/src/com/intellij/json/editor/smartEnter/JsonSmartEnterProcessor.java
diff --git a/json/split/src/com/intellij/json/formatter/JsonBlock.java b/json/src/com/intellij/json/formatter/JsonBlock.java
similarity index 100%
rename from json/split/src/com/intellij/json/formatter/JsonBlock.java
rename to json/src/com/intellij/json/formatter/JsonBlock.java
diff --git a/json/split/src/com/intellij/json/formatter/JsonCodeStyleSettings.java b/json/src/com/intellij/json/formatter/JsonCodeStyleSettings.java
similarity index 100%
rename from json/split/src/com/intellij/json/formatter/JsonCodeStyleSettings.java
rename to json/src/com/intellij/json/formatter/JsonCodeStyleSettings.java
diff --git a/json/split/src/com/intellij/json/formatter/JsonCodeStyleSettingsProvider.java b/json/src/com/intellij/json/formatter/JsonCodeStyleSettingsProvider.java
similarity index 100%
rename from json/split/src/com/intellij/json/formatter/JsonCodeStyleSettingsProvider.java
rename to json/src/com/intellij/json/formatter/JsonCodeStyleSettingsProvider.java
diff --git a/json/split/src/com/intellij/json/formatter/JsonFormattingBuilderModel.java b/json/src/com/intellij/json/formatter/JsonFormattingBuilderModel.java
similarity index 100%
rename from json/split/src/com/intellij/json/formatter/JsonFormattingBuilderModel.java
rename to json/src/com/intellij/json/formatter/JsonFormattingBuilderModel.java
diff --git a/json/split/src/com/intellij/json/formatter/JsonLanguageCodeStyleSettingsProvider.java b/json/src/com/intellij/json/formatter/JsonLanguageCodeStyleSettingsProvider.java
similarity index 100%
rename from json/split/src/com/intellij/json/formatter/JsonLanguageCodeStyleSettingsProvider.java
rename to json/src/com/intellij/json/formatter/JsonLanguageCodeStyleSettingsProvider.java
diff --git a/json/split/src/com/intellij/json/formatter/JsonLineWrapPositionStrategy.java b/json/src/com/intellij/json/formatter/JsonLineWrapPositionStrategy.java
similarity index 100%
rename from json/split/src/com/intellij/json/formatter/JsonLineWrapPositionStrategy.java
rename to json/src/com/intellij/json/formatter/JsonLineWrapPositionStrategy.java
diff --git a/json/split/src/com/intellij/json/formatter/JsonTrailingCommaRemover.java b/json/src/com/intellij/json/formatter/JsonTrailingCommaRemover.java
similarity index 100%
rename from json/split/src/com/intellij/json/formatter/JsonTrailingCommaRemover.java
rename to json/src/com/intellij/json/formatter/JsonTrailingCommaRemover.java
diff --git a/json/split/src/com/intellij/json/highlighting/JsonColorsPage.java b/json/src/com/intellij/json/highlighting/JsonColorsPage.java
similarity index 100%
rename from json/split/src/com/intellij/json/highlighting/JsonColorsPage.java
rename to json/src/com/intellij/json/highlighting/JsonColorsPage.java
diff --git a/json/split/src/com/intellij/json/highlighting/JsonHighlightingLexer.java b/json/src/com/intellij/json/highlighting/JsonHighlightingLexer.java
similarity index 100%
rename from json/split/src/com/intellij/json/highlighting/JsonHighlightingLexer.java
rename to json/src/com/intellij/json/highlighting/JsonHighlightingLexer.java
diff --git a/json/split/src/com/intellij/json/highlighting/JsonStringLiteralLexer.java b/json/src/com/intellij/json/highlighting/JsonStringLiteralLexer.java
similarity index 100%
rename from json/split/src/com/intellij/json/highlighting/JsonStringLiteralLexer.java
rename to json/src/com/intellij/json/highlighting/JsonStringLiteralLexer.java
diff --git a/json/split/src/com/intellij/json/highlighting/JsonSyntaxHighlighterFactory.java b/json/src/com/intellij/json/highlighting/JsonSyntaxHighlighterFactory.java
similarity index 100%
rename from json/split/src/com/intellij/json/highlighting/JsonSyntaxHighlighterFactory.java
rename to json/src/com/intellij/json/highlighting/JsonSyntaxHighlighterFactory.java
diff --git a/json/split/src/com/intellij/json/json5/Json5FileType.java b/json/src/com/intellij/json/json5/Json5FileType.java
similarity index 100%
rename from json/split/src/com/intellij/json/json5/Json5FileType.java
rename to json/src/com/intellij/json/json5/Json5FileType.java
diff --git a/json/split/src/com/intellij/json/json5/Json5Language.java b/json/src/com/intellij/json/json5/Json5Language.java
similarity index 100%
rename from json/split/src/com/intellij/json/json5/Json5Language.java
rename to json/src/com/intellij/json/json5/Json5Language.java
diff --git a/json/split/src/com/intellij/json/json5/Json5Lexer.java b/json/src/com/intellij/json/json5/Json5Lexer.java
similarity index 100%
rename from json/split/src/com/intellij/json/json5/Json5Lexer.java
rename to json/src/com/intellij/json/json5/Json5Lexer.java
diff --git a/json/split/src/com/intellij/json/json5/Json5ParserDefinition.java b/json/src/com/intellij/json/json5/Json5ParserDefinition.java
similarity index 100%
rename from json/split/src/com/intellij/json/json5/Json5ParserDefinition.java
rename to json/src/com/intellij/json/json5/Json5ParserDefinition.java
diff --git a/json/split/src/com/intellij/json/json5/_Json5Lexer.flex b/json/src/com/intellij/json/json5/_Json5Lexer.flex
similarity index 100%
rename from json/split/src/com/intellij/json/json5/_Json5Lexer.flex
rename to json/src/com/intellij/json/json5/_Json5Lexer.flex
diff --git a/json/split/src/com/intellij/json/json5/codeinsight/Json5JsonLiteralChecker.java b/json/src/com/intellij/json/json5/codeinsight/Json5JsonLiteralChecker.java
similarity index 100%
rename from json/split/src/com/intellij/json/json5/codeinsight/Json5JsonLiteralChecker.java
rename to json/src/com/intellij/json/json5/codeinsight/Json5JsonLiteralChecker.java
diff --git a/json/split/src/com/intellij/json/json5/highlighting/Json5SyntaxHighlightingFactory.java b/json/src/com/intellij/json/json5/highlighting/Json5SyntaxHighlightingFactory.java
similarity index 100%
rename from json/split/src/com/intellij/json/json5/highlighting/Json5SyntaxHighlightingFactory.java
rename to json/src/com/intellij/json/json5/highlighting/Json5SyntaxHighlightingFactory.java
diff --git a/json/split/src/com/intellij/json/jsonLines/JsonLinesFileType.kt b/json/src/com/intellij/json/jsonLines/JsonLinesFileType.kt
similarity index 100%
rename from json/split/src/com/intellij/json/jsonLines/JsonLinesFileType.kt
rename to json/src/com/intellij/json/jsonLines/JsonLinesFileType.kt
diff --git a/json/split/src/com/intellij/json/jsonLines/JsonLinesLanguage.kt b/json/src/com/intellij/json/jsonLines/JsonLinesLanguage.kt
similarity index 100%
rename from json/split/src/com/intellij/json/jsonLines/JsonLinesLanguage.kt
rename to json/src/com/intellij/json/jsonLines/JsonLinesLanguage.kt
diff --git a/json/split/src/com/intellij/json/jsonLines/JsonLinesParserDefinition.kt b/json/src/com/intellij/json/jsonLines/JsonLinesParserDefinition.kt
similarity index 100%
rename from json/split/src/com/intellij/json/jsonLines/JsonLinesParserDefinition.kt
rename to json/src/com/intellij/json/jsonLines/JsonLinesParserDefinition.kt
diff --git a/json/split/src/com/intellij/json/psi/JsonElement.java b/json/src/com/intellij/json/psi/JsonElement.java
similarity index 100%
rename from json/split/src/com/intellij/json/psi/JsonElement.java
rename to json/src/com/intellij/json/psi/JsonElement.java
diff --git a/json/split/src/com/intellij/json/psi/JsonElementGenerator.java b/json/src/com/intellij/json/psi/JsonElementGenerator.java
similarity index 100%
rename from json/split/src/com/intellij/json/psi/JsonElementGenerator.java
rename to json/src/com/intellij/json/psi/JsonElementGenerator.java
diff --git a/json/split/src/com/intellij/json/psi/JsonFile.java b/json/src/com/intellij/json/psi/JsonFile.java
similarity index 100%
rename from json/split/src/com/intellij/json/psi/JsonFile.java
rename to json/src/com/intellij/json/psi/JsonFile.java
diff --git a/json/split/src/com/intellij/json/psi/JsonParserUtil.java b/json/src/com/intellij/json/psi/JsonParserUtil.java
similarity index 100%
rename from json/split/src/com/intellij/json/psi/JsonParserUtil.java
rename to json/src/com/intellij/json/psi/JsonParserUtil.java
diff --git a/json/split/src/com/intellij/json/psi/JsonPsiChangeUtils.java b/json/src/com/intellij/json/psi/JsonPsiChangeUtils.java
similarity index 100%
rename from json/split/src/com/intellij/json/psi/JsonPsiChangeUtils.java
rename to json/src/com/intellij/json/psi/JsonPsiChangeUtils.java
diff --git a/json/split/src/com/intellij/json/psi/JsonPsiUtil.java b/json/src/com/intellij/json/psi/JsonPsiUtil.java
similarity index 100%
rename from json/split/src/com/intellij/json/psi/JsonPsiUtil.java
rename to json/src/com/intellij/json/psi/JsonPsiUtil.java
diff --git a/json/split/src/com/intellij/json/psi/JsonStringLiteralManipulator.java b/json/src/com/intellij/json/psi/JsonStringLiteralManipulator.java
similarity index 100%
rename from json/split/src/com/intellij/json/psi/JsonStringLiteralManipulator.java
rename to json/src/com/intellij/json/psi/JsonStringLiteralManipulator.java
diff --git a/json/split/src/com/intellij/json/psi/impl/JSStringLiteralEscaper.java b/json/src/com/intellij/json/psi/impl/JSStringLiteralEscaper.java
similarity index 100%
rename from json/split/src/com/intellij/json/psi/impl/JSStringLiteralEscaper.java
rename to json/src/com/intellij/json/psi/impl/JSStringLiteralEscaper.java
diff --git a/json/split/src/com/intellij/json/psi/impl/JsonElementImpl.java b/json/src/com/intellij/json/psi/impl/JsonElementImpl.java
similarity index 100%
rename from json/split/src/com/intellij/json/psi/impl/JsonElementImpl.java
rename to json/src/com/intellij/json/psi/impl/JsonElementImpl.java
diff --git a/json/split/src/com/intellij/json/psi/impl/JsonFileImpl.java b/json/src/com/intellij/json/psi/impl/JsonFileImpl.java
similarity index 100%
rename from json/split/src/com/intellij/json/psi/impl/JsonFileImpl.java
rename to json/src/com/intellij/json/psi/impl/JsonFileImpl.java
diff --git a/json/split/src/com/intellij/json/psi/impl/JsonLiteralMixin.java b/json/src/com/intellij/json/psi/impl/JsonLiteralMixin.java
similarity index 100%
rename from json/split/src/com/intellij/json/psi/impl/JsonLiteralMixin.java
rename to json/src/com/intellij/json/psi/impl/JsonLiteralMixin.java
diff --git a/json/split/src/com/intellij/json/psi/impl/JsonObjectMixin.java b/json/src/com/intellij/json/psi/impl/JsonObjectMixin.java
similarity index 100%
rename from json/split/src/com/intellij/json/psi/impl/JsonObjectMixin.java
rename to json/src/com/intellij/json/psi/impl/JsonObjectMixin.java
diff --git a/json/split/src/com/intellij/json/psi/impl/JsonPropertyMixin.java b/json/src/com/intellij/json/psi/impl/JsonPropertyMixin.java
similarity index 100%
rename from json/split/src/com/intellij/json/psi/impl/JsonPropertyMixin.java
rename to json/src/com/intellij/json/psi/impl/JsonPropertyMixin.java
diff --git a/json/split/src/com/intellij/json/psi/impl/JsonPropertyNameReference.java b/json/src/com/intellij/json/psi/impl/JsonPropertyNameReference.java
similarity index 100%
rename from json/split/src/com/intellij/json/psi/impl/JsonPropertyNameReference.java
rename to json/src/com/intellij/json/psi/impl/JsonPropertyNameReference.java
diff --git a/json/split/src/com/intellij/json/psi/impl/JsonPsiImplUtils.java b/json/src/com/intellij/json/psi/impl/JsonPsiImplUtils.java
similarity index 100%
rename from json/split/src/com/intellij/json/psi/impl/JsonPsiImplUtils.java
rename to json/src/com/intellij/json/psi/impl/JsonPsiImplUtils.java
diff --git a/json/split/src/com/intellij/json/psi/impl/JsonRecursiveElementVisitor.java b/json/src/com/intellij/json/psi/impl/JsonRecursiveElementVisitor.java
similarity index 100%
rename from json/split/src/com/intellij/json/psi/impl/JsonRecursiveElementVisitor.java
rename to json/src/com/intellij/json/psi/impl/JsonRecursiveElementVisitor.java
diff --git a/json/split/src/com/intellij/json/psi/impl/JsonReferenceLiteralMixin.java b/json/src/com/intellij/json/psi/impl/JsonReferenceLiteralMixin.java
similarity index 100%
rename from json/split/src/com/intellij/json/psi/impl/JsonReferenceLiteralMixin.java
rename to json/src/com/intellij/json/psi/impl/JsonReferenceLiteralMixin.java
diff --git a/json/split/src/com/intellij/json/psi/impl/JsonStringLiteralMixin.java b/json/src/com/intellij/json/psi/impl/JsonStringLiteralMixin.java
similarity index 100%
rename from json/split/src/com/intellij/json/psi/impl/JsonStringLiteralMixin.java
rename to json/src/com/intellij/json/psi/impl/JsonStringLiteralMixin.java
diff --git a/json/split/src/com/intellij/json/psi/impl/JsonTextLiteralService.kt b/json/src/com/intellij/json/psi/impl/JsonTextLiteralService.kt
similarity index 100%
rename from json/split/src/com/intellij/json/psi/impl/JsonTextLiteralService.kt
rename to json/src/com/intellij/json/psi/impl/JsonTextLiteralService.kt
diff --git a/json/split/src/com/intellij/json/psi/impl/jsonArrayPresentationUtils.kt b/json/src/com/intellij/json/psi/impl/jsonArrayPresentationUtils.kt
similarity index 100%
rename from json/split/src/com/intellij/json/psi/impl/jsonArrayPresentationUtils.kt
rename to json/src/com/intellij/json/psi/impl/jsonArrayPresentationUtils.kt
diff --git a/json/split/src/com/intellij/json/split/JsonCodeStyleSettingsCustomDataSynchronizer.kt b/json/src/com/intellij/json/split/JsonCodeStyleSettingsCustomDataSynchronizer.kt
similarity index 100%
rename from json/split/src/com/intellij/json/split/JsonCodeStyleSettingsCustomDataSynchronizer.kt
rename to json/src/com/intellij/json/split/JsonCodeStyleSettingsCustomDataSynchronizer.kt
diff --git a/json/split/src/com/intellij/json/split/jsonBackendExtensionSuppressor.kt b/json/src/com/intellij/json/split/jsonBackendExtensionSuppressor.kt
similarity index 100%
rename from json/split/src/com/intellij/json/split/jsonBackendExtensionSuppressor.kt
rename to json/src/com/intellij/json/split/jsonBackendExtensionSuppressor.kt