diff --git a/.idea/libraries/Velocity.xml b/.idea/libraries/Velocity.xml
index 8552bfe306b3..38d287f784b6 100644
--- a/.idea/libraries/Velocity.xml
+++ b/.idea/libraries/Velocity.xml
@@ -1,18 +1,12 @@
-
-
-
-
-
+
-
-
+
-
-
+
\ No newline at end of file
diff --git a/.idea/libraries/commons_lang.xml b/.idea/libraries/commons_lang.xml
new file mode 100644
index 000000000000..22bd9909d49b
--- /dev/null
+++ b/.idea/libraries/commons_lang.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/VelocityIncludesClassLoader.java b/java/java-impl/src/com/intellij/codeInsight/generation/VelocityIncludesClassLoader.java
index 0266e86d3d36..d396667b1e69 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/VelocityIncludesClassLoader.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/VelocityIncludesClassLoader.java
@@ -18,11 +18,11 @@ package com.intellij.codeInsight.generation;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
-import java.io.InputStream;
+import java.io.Reader;
public class VelocityIncludesClassLoader extends ClasspathResourceLoader {
@Override
- public InputStream getResourceStream(String name) throws ResourceNotFoundException {
- return super.getResourceStream("com/intellij/codeInsight/generation/" + name);
+ public Reader getResourceReader(String name, String encoding) throws ResourceNotFoundException {
+ return super.getResourceReader("com/intellij/codeInsight/generation/" + name, encoding);
}
}
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/bytecodeAnalysis/BytecodeAnalysisResultsHighlightingTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/bytecodeAnalysis/BytecodeAnalysisResultsHighlightingTest.java
index 7e8df0db9c29..9af63cc56cbb 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInspection/bytecodeAnalysis/BytecodeAnalysisResultsHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/bytecodeAnalysis/BytecodeAnalysisResultsHighlightingTest.java
@@ -21,6 +21,7 @@ public class BytecodeAnalysisResultsHighlightingTest extends DataFlowInspectionT
public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @NotNull ContentEntry contentEntry) {
super.configureModule(module, model, contentEntry);
PsiTestUtil.addProjectLibrary(model, "velocity", IntelliJProjectConfiguration.getProjectLibraryClassesRootPaths("Velocity"));
+ PsiTestUtil.addProjectLibrary(model, "commons-lang", IntelliJProjectConfiguration.getProjectLibraryClassesRootPaths("commons-lang"));
}
};
}
diff --git a/java/java-tests/testSrc/com/intellij/java/ide/fileTemplates/impl/FileTemplatesTest.kt b/java/java-tests/testSrc/com/intellij/java/ide/fileTemplates/impl/FileTemplatesTest.kt
index c59663ccdb08..99c92e300071 100644
--- a/java/java-tests/testSrc/com/intellij/java/ide/fileTemplates/impl/FileTemplatesTest.kt
+++ b/java/java-tests/testSrc/com/intellij/java/ide/fileTemplates/impl/FileTemplatesTest.kt
@@ -250,9 +250,4 @@ internal class FileTemplatesTest : JavaProjectTestCase() {
}
return false
}
-
- fun testStringUtilsSpecialVariableWorksAndHasRemoveAndHumpMethod() {
- val template = addTestTemplate("my_class", "prefix \${StringUtils.removeAndHump(\"foo_barBar\")} suffix")
- assertThat(template.getText(emptyMap())).isEqualTo("prefix FooBarBar suffix")
- }
}
\ No newline at end of file
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 9bb33c3562cd..0f1c9eb9d9dc 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt
@@ -570,7 +570,6 @@ object CommunityRepositoryModules {
spec.withModuleLibrary("moshi", "intellij.android.core", "")
//prebuilts/tools/common/m2:eclipse-layout-kernel <= not recognized
spec.withModuleLibrary("juniversalchardet", "android.sdktools.db-compiler", "")
- spec.withModuleLibrary("commons-lang", "android.sdktools.db-compiler", "")
spec.withModuleLibrary("javapoet", "android.sdktools.db-compiler", "")
spec.withModuleLibrary("auto-common", "android.sdktools.db-compiler", "")
spec.withModuleLibrary("jetifier-core", "android.sdktools.db-compilerCommon", "")
@@ -582,6 +581,7 @@ object CommunityRepositoryModules {
spec.withProjectLibrary("android-test-plugin-host-device-info-proto")
spec.withProjectLibrary("asm-tools")
spec.withProjectLibrary("baksmali")
+ spec.withProjectLibrary("commons-lang")
spec.withProjectLibrary("dexlib2")
spec.withProjectLibrary("emulator-proto")
//tools/adt/idea/.idea/libraries:ffmpeg <= FIXME
diff --git a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
index b1d0f6a274da..a52fc1c453d5 100644
--- a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
+++ b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
@@ -26,10 +26,10 @@
-
+
\ No newline at end of file
diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml
index 9241a3fdec2b..5fc4e9cde4b3 100644
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -65,5 +65,8 @@
+
+
+
\ No newline at end of file
diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java
index 8076b411a426..5fd8fa9d3edd 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java
@@ -61,7 +61,7 @@ public final class FileTemplateUtil {
private static String @NotNull [] calculateAttributes(@NotNull String templateContent, @NotNull Set propertiesNames, boolean includeDummies, @NotNull Project project) throws ParseException {
final Set unsetAttributes = new LinkedHashSet<>();
final Set definedAttributes = new HashSet<>();
- SimpleNode template = VelocityTemplateContext.withContext(project, ()->VelocityWrapper.parse(new StringReader(templateContent), "MyTemplate"));
+ SimpleNode template = VelocityTemplateContext.withContext(project, ()->VelocityWrapper.parse(new StringReader(templateContent)));
collectAttributes(unsetAttributes, definedAttributes, template, propertiesNames, includeDummies, new HashSet<>(), project);
for (String definedAttribute : definedAttributes) {
unsetAttributes.remove(definedAttribute);
@@ -106,7 +106,7 @@ public final class FileTemplateUtil {
includedTemplate = templateManager.getPattern(s);
}
if (includedTemplate != null && visitedIncludes.add(s)) {
- SimpleNode template = VelocityWrapper.parse(new StringReader(includedTemplate.getText()), "MyTemplate");
+ SimpleNode template = VelocityWrapper.parse(new StringReader(includedTemplate.getText()));
collectAttributes(referenced, defined, template, propertiesNames, includeDummies, visitedIncludes, project);
}
}
diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/VelocityWrapper.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/VelocityWrapper.java
index 7de4a9e6ce71..b7858811596f 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/VelocityWrapper.java
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/VelocityWrapper.java
@@ -4,24 +4,24 @@ package com.intellij.ide.fileTemplates;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
-import org.apache.commons.collections.ExtendedProperties;
+import org.apache.velocity.Template;
import org.apache.velocity.app.Velocity;
import org.apache.velocity.context.Context;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.runtime.log.LogSystem;
import org.apache.velocity.runtime.parser.ParseException;
import org.apache.velocity.runtime.parser.node.SimpleNode;
import org.apache.velocity.runtime.resource.Resource;
import org.apache.velocity.runtime.resource.ResourceManager;
import org.apache.velocity.runtime.resource.ResourceManagerImpl;
import org.apache.velocity.runtime.resource.loader.ResourceLoader;
+import org.apache.velocity.util.ExtProperties;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import org.slf4j.helpers.NOPLogger;
import java.io.*;
@@ -40,17 +40,7 @@ final class VelocityWrapper {
", ResourceManagerImpl in " + PathManager.getJarPathForClass(ResourceManagerImpl.class));
}
- LogSystem emptyLogSystem = new LogSystem() {
- @Override
- public void init(RuntimeServices runtimeServices) throws Exception {
- }
-
- @Override
- public void logVelocityMessage(int i, String s) {
- //todo[myakovlev] log somethere?
- }
- };
- Velocity.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM, emptyLogSystem);
+ Velocity.setProperty(RuntimeConstants.RUNTIME_LOG_INSTANCE, NOPLogger.NOP_LOGGER);
Velocity.setProperty(RuntimeConstants.INPUT_ENCODING, FileTemplate.ourEncoding);
Velocity.setProperty(RuntimeConstants.PARSER_POOL_SIZE, 3);
Velocity.setProperty(RuntimeConstants.RESOURCE_LOADER, "includes");
@@ -73,11 +63,11 @@ final class VelocityWrapper {
Velocity.setProperty("includes.resource.loader.instance", new ResourceLoader() {
@Override
- public void init(ExtendedProperties configuration) {
+ public void init(ExtProperties configuration) {
}
@Override
- public InputStream getResourceStream(String resourceName) throws ResourceNotFoundException {
+ public Reader getResourceReader(String resourceName, String encoding) throws ResourceNotFoundException {
FileTemplateManager templateManager = VelocityTemplateContext.getFromContext();
final FileTemplate include = templateManager.getPattern(resourceName);
if (include == null) {
@@ -85,7 +75,7 @@ final class VelocityWrapper {
}
final String text = include.getText();
try {
- return new ByteArrayInputStream(text.getBytes(FileTemplate.ourEncoding));
+ return new InputStreamReader(new ByteArrayInputStream(text.getBytes(FileTemplate.ourEncoding)), FileTemplate.ourEncoding);
}
catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
@@ -111,8 +101,8 @@ final class VelocityWrapper {
}
@NotNull
- static SimpleNode parse(@NotNull Reader reader, @NotNull String templateName) throws ParseException {
- return RuntimeSingleton.parse(reader, templateName);
+ static SimpleNode parse(@NotNull Reader reader) throws ParseException {
+ return RuntimeSingleton.parse(reader, new Template());
}
static boolean evaluate(@Nullable Project project, Context context, @NotNull Writer writer, String templateContent)
diff --git a/platform/workspaceModel/jps/tests/intellij.platform.workspaceModel.jps.tests.iml b/platform/workspaceModel/jps/tests/intellij.platform.workspaceModel.jps.tests.iml
index 54203d6ff9d9..55cf2b33d1a1 100644
--- a/platform/workspaceModel/jps/tests/intellij.platform.workspaceModel.jps.tests.iml
+++ b/platform/workspaceModel/jps/tests/intellij.platform.workspaceModel.jps.tests.iml
@@ -17,7 +17,7 @@
-
+
diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/VelocityHelper.java b/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/VelocityHelper.java
index cba80eb4e21c..a7b0f7716934 100644
--- a/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/VelocityHelper.java
+++ b/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/VelocityHelper.java
@@ -10,11 +10,9 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile;
import com.intellij.psi.util.PsiUtilCore;
-import org.apache.commons.collections.ExtendedProperties;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.log.JdkLogChute;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -96,24 +94,19 @@ public final class VelocityHelper
{
try
{
- VelocityEngine engine = new VelocityEngine();
- ExtendedProperties extendedProperties = new ExtendedProperties();
+ VelocityEngine engine = new VelocityEngine();
- extendedProperties.addProperty(RuntimeConstants.RESOURCE_LOADER, "file");
- extendedProperties.addProperty(RuntimeConstants.PARSER_POOL_SIZE, "1");
+ engine.setProperty(RuntimeConstants.RESOURCE_LOADER, "file");
+ engine.setProperty(RuntimeConstants.PARSER_POOL_SIZE, "1");
- extendedProperties.addProperty("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.FileResourceLoader");
- extendedProperties.addProperty("file.resource.loader.path", PathManager.getPluginsPath() + "/Copyright/resources");
+ engine.setProperty("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.FileResourceLoader");
+ engine.setProperty("file.resource.loader.path", PathManager.getPluginsPath() + "/Copyright/resources");
- extendedProperties.addProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
- JdkLogChute.class.getName());
- extendedProperties
- .addProperty(JdkLogChute.RUNTIME_LOG_JDK_LOGGER, CopyrightManager.class.getName());
+ engine.setProperty(RuntimeConstants.RUNTIME_LOG_NAME, CopyrightManager.class.getName());
- engine.setExtendedProperties(extendedProperties);
- engine.init();
+ engine.init();
- instance = engine;
+ instance = engine;
}
catch (Exception ignored)
{
diff --git a/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml b/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml
index ff908d8a441f..9d5fce7e8419 100644
--- a/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml
+++ b/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml
@@ -23,5 +23,6 @@
+
\ No newline at end of file
diff --git a/plugins/editorconfig/intellij.editorconfig.iml b/plugins/editorconfig/intellij.editorconfig.iml
index 2cf09a33fea4..75b017f0de91 100644
--- a/plugins/editorconfig/intellij.editorconfig.iml
+++ b/plugins/editorconfig/intellij.editorconfig.iml
@@ -25,7 +25,7 @@
-
+
diff --git a/plugins/evaluation-plugin/core/intellij.evaluationPlugin.core.iml b/plugins/evaluation-plugin/core/intellij.evaluationPlugin.core.iml
index 62f3c4bc448c..aae20cdd69ec 100644
--- a/plugins/evaluation-plugin/core/intellij.evaluationPlugin.core.iml
+++ b/plugins/evaluation-plugin/core/intellij.evaluationPlugin.core.iml
@@ -12,7 +12,7 @@
-
+
\ No newline at end of file
diff --git a/plugins/generate-tostring/src/org/jetbrains/java/generate/velocity/VelocityFactory.java b/plugins/generate-tostring/src/org/jetbrains/java/generate/velocity/VelocityFactory.java
index c8ad8ec4d16e..773c50f21932 100644
--- a/plugins/generate-tostring/src/org/jetbrains/java/generate/velocity/VelocityFactory.java
+++ b/plugins/generate-tostring/src/org/jetbrains/java/generate/velocity/VelocityFactory.java
@@ -17,11 +17,8 @@ package org.jetbrains.java.generate.velocity;
import com.intellij.codeInsight.generation.VelocityIncludesClassLoader;
import com.intellij.openapi.util.ClassLoaderUtil;
-import org.apache.commons.collections.ExtendedProperties;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.log.JdkLogChute;
-import org.apache.velocity.runtime.log.SimpleLog4JLogSystem;
/**
* Velocity factory.
@@ -47,15 +44,10 @@ public final class VelocityFactory {
* @return a new velocity engine that is initialized.
*/
private static VelocityEngine newVelocityEngine() {
- ExtendedProperties prop = new ExtendedProperties();
- prop.addProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, JdkLogChute.class.getName());
- prop.addProperty(JdkLogChute.RUNTIME_LOG_JDK_LOGGER, "GenerateToString");
- prop.addProperty(RuntimeConstants.RESOURCE_LOADER, "includes");
- prop.addProperty("includes.resource.loader.class", VelocityIncludesClassLoader.class.getName());
- prop.addProperty(RuntimeConstants.VM_PERM_ALLOW_INLINE_REPLACE_GLOBAL, "true");
-
VelocityEngine velocity = new VelocityEngine();
- velocity.setExtendedProperties(prop);
+ velocity.addProperty(RuntimeConstants.RESOURCE_LOADER, "includes");
+ velocity.addProperty("includes.resource.loader.class", VelocityIncludesClassLoader.class.getName());
+ velocity.addProperty(RuntimeConstants.VM_PERM_ALLOW_INLINE_REPLACE_GLOBAL, "true");
ClassLoaderUtil.runWithClassLoader(VelocityIncludesClassLoader.class.getClassLoader(), () -> velocity.init());
return velocity;
}
diff --git a/plugins/git4idea/intellij.vcs.git.iml b/plugins/git4idea/intellij.vcs.git.iml
index 82cc4ebe67ad..54c85e397f0d 100644
--- a/plugins/git4idea/intellij.vcs.git.iml
+++ b/plugins/git4idea/intellij.vcs.git.iml
@@ -78,7 +78,7 @@
-
+
diff --git a/plugins/gradle/intellij.gradle.common.iml b/plugins/gradle/intellij.gradle.common.iml
index 29f0134e2a1b..90a4d2cd9407 100644
--- a/plugins/gradle/intellij.gradle.common.iml
+++ b/plugins/gradle/intellij.gradle.common.iml
@@ -37,11 +37,11 @@
-
+
\ No newline at end of file
diff --git a/plugins/ide-features-trainer/intellij.featuresTrainer.iml b/plugins/ide-features-trainer/intellij.featuresTrainer.iml
index 9e896ff1a122..57e51350de9e 100644
--- a/plugins/ide-features-trainer/intellij.featuresTrainer.iml
+++ b/plugins/ide-features-trainer/intellij.featuresTrainer.iml
@@ -47,7 +47,7 @@
-
+
diff --git a/plugins/kotlin/idea/kotlin.idea.iml b/plugins/kotlin/idea/kotlin.idea.iml
index def6412894b9..0a6fee594d95 100644
--- a/plugins/kotlin/idea/kotlin.idea.iml
+++ b/plugins/kotlin/idea/kotlin.idea.iml
@@ -84,7 +84,7 @@
-
+
diff --git a/plugins/kotlin/project-wizard/core/kotlin.project-wizard.core.iml b/plugins/kotlin/project-wizard/core/kotlin.project-wizard.core.iml
index 40066fce15e7..6437b6929339 100644
--- a/plugins/kotlin/project-wizard/core/kotlin.project-wizard.core.iml
+++ b/plugins/kotlin/project-wizard/core/kotlin.project-wizard.core.iml
@@ -22,5 +22,6 @@
+
\ No newline at end of file
diff --git a/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/core/service/TemplateEngineService.kt b/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/core/service/TemplateEngineService.kt
index 793e1c3f75c7..3f70d70cef36 100644
--- a/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/core/service/TemplateEngineService.kt
+++ b/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/core/service/TemplateEngineService.kt
@@ -5,8 +5,6 @@ package org.jetbrains.kotlin.tools.projectWizard.core.service
import org.apache.velocity.VelocityContext
import org.apache.velocity.app.Velocity
import org.apache.velocity.runtime.RuntimeConstants
-import org.apache.velocity.runtime.RuntimeServices
-import org.apache.velocity.runtime.log.LogChute
import org.jetbrains.kotlin.tools.projectWizard.core.TaskResult
import org.jetbrains.kotlin.tools.projectWizard.core.Writer
import org.jetbrains.kotlin.tools.projectWizard.core.div
@@ -14,6 +12,7 @@ import org.jetbrains.kotlin.tools.projectWizard.templates.FileTemplate
import org.jetbrains.kotlin.tools.projectWizard.templates.FileTemplateDescriptor
import org.jetbrains.kotlin.tools.projectWizard.templates.FileTextDescriptor
import org.jetbrains.kotlin.tools.projectWizard.templates.Template
+import org.slf4j.helpers.NOPLogger
import java.io.StringWriter
abstract class TemplateEngineService : WizardService {
@@ -53,18 +52,11 @@ class VelocityTemplateEngineServiceImpl : TemplateEngineService(), IdeaIndepende
private fun runVelocityActionWithoutLogging(action: () -> Unit) {
- val initialLogger = Velocity.getProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM)
- Velocity.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM, DoNothingVelocityLogger)
+ val initialLogger = Velocity.getProperty(RuntimeConstants.RUNTIME_LOG_INSTANCE)
+ Velocity.setProperty(RuntimeConstants.RUNTIME_LOG_INSTANCE, NOPLogger.NOP_LOGGER)
action()
if (initialLogger != null) {
- Velocity.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM, initialLogger)
+ Velocity.setProperty(RuntimeConstants.RUNTIME_LOG_INSTANCE, initialLogger)
}
}
-
- private object DoNothingVelocityLogger : LogChute {
- override fun isLevelEnabled(level: Int): Boolean = false
- override fun init(rs: RuntimeServices?) = Unit
- override fun log(level: Int, message: String?) = Unit
- override fun log(level: Int, message: String?, t: Throwable?) = Unit
- }
}
\ No newline at end of file
diff --git a/plugins/markdown/core/intellij.markdown.core.iml b/plugins/markdown/core/intellij.markdown.core.iml
index 415d1c8fefcd..141c528f59e4 100644
--- a/plugins/markdown/core/intellij.markdown.core.iml
+++ b/plugins/markdown/core/intellij.markdown.core.iml
@@ -31,7 +31,7 @@
-
+
diff --git a/plugins/maven/intellij.maven.iml b/plugins/maven/intellij.maven.iml
index 9e167367dd6a..3807bd2f4e64 100644
--- a/plugins/maven/intellij.maven.iml
+++ b/plugins/maven/intellij.maven.iml
@@ -73,7 +73,7 @@
-
+
diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml
index fa46d10aeb52..4f0f5354a0ac 100644
--- a/python/intellij.python.community.impl.iml
+++ b/python/intellij.python.community.impl.iml
@@ -78,7 +78,7 @@
-
+
diff --git a/python/testSrc/intellij.python.community.tests.iml b/python/testSrc/intellij.python.community.tests.iml
index 8129b2bb3d9b..3d8673398794 100644
--- a/python/testSrc/intellij.python.community.tests.iml
+++ b/python/testSrc/intellij.python.community.tests.iml
@@ -43,7 +43,7 @@
-
+