MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-153908 The setting "reformat according to style" is not saved. (fixing tests)

Browse Source
This commit is contained in:
Dmitry Avdeev
2016-07-20 11:20:49 +03:00
parent 0f82a3bf77
commit 34c2f55be7
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
+19 -4
View File
@@ -16,6 +16,9 @@
package com.intellij.codeInsight;
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
import com.intellij.ide.fileTemplates.FileTemplate;
import com.intellij.ide.fileTemplates.FileTemplateManager;
import com.intellij.ide.fileTemplates.impl.FileTemplateManagerImpl;
import com.intellij.injected.editor.EditorWindow;
import com.intellij.openapi.actionSystem.IdeActions;
import com.intellij.openapi.application.ApplicationManager;
@@ -57,10 +60,7 @@ import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* @author Mike
@@ -81,6 +81,21 @@ public abstract class CodeInsightTestCase extends PsiTestCase {
return editor;
}
@Override
protected void setUp() throws Exception {
super.setUp();
FileTemplateManager manager = FileTemplateManager.getDefaultInstance();
for (String tname : Arrays.asList("Class", "AnnotationType", "Enum", "Interface")) {
for (FileTemplate template : manager.getInternalTemplates()) {
if (tname.equals(template.getName())) {
String text = "package $PACKAGE_NAME$;\npublic " + manager.internalTemplateToSubject(tname) + " $NAME$ { }";
template.setText(FileTemplateManagerImpl.normalizeText(text));
break;
}
}
}
}
@Override
protected void tearDown() throws Exception {
try {
platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java
+1 -7
View File
@@ -276,7 +276,7 @@ public class FileTemplateManagerImpl extends FileTemplateManager implements Pers
}
@NotNull
private static String normalizeText(@NotNull String text) {
public static String normalizeText(@NotNull String text) {
text = StringUtil.convertLineSeparators(text);
text = StringUtil.replace(text, "$NAME$", "${NAME}");
text = StringUtil.replace(text, "$PACKAGE_NAME$", "${PACKAGE_NAME}");
@@ -286,12 +286,6 @@ public class FileTemplateManagerImpl extends FileTemplateManager implements Pers
return text;
}
@NonNls
@NotNull
private String getTestClassTemplateText(@NotNull @NonNls String templateName) {
return "package $PACKAGE_NAME$;\npublic " + internalTemplateToSubject(templateName) + " $NAME$ { }";
}
@Override
@NotNull
public String internalTemplateToSubject(@NotNull @NonNls String templateName) {