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

Cleanup (formatting)

Browse Source
This commit is contained in:
Roman Shevchenko
2015-06-22 18:05:51 +03:00
parent 01d106fb99
commit ccbe820258
7 changed files with 64 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/template/impl/JavaDefaultLiveTemplatesProvider.java
+2 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,13 +15,11 @@
*/
package com.intellij.codeInsight.template.impl;
import org.jetbrains.annotations.NonNls;
/**
* @author yole
*/
public class JavaDefaultLiveTemplatesProvider implements DefaultLiveTemplatesProvider {
private static final @NonNls String[] DEFAULT_TEMPLATES = new String[]{
private static final String[] DEFAULT_TEMPLATES = {
"/liveTemplates/iterations",
"/liveTemplates/other",
"/liveTemplates/output",
java/java-tests/testSrc/com/intellij/codeInsight/generation/surroundWith/JavaSurroundWithTest.java
+21 -23
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -39,24 +39,23 @@ import org.jetbrains.annotations.Nullable;
* @since 5/3/11 2:35 PM
*/
public class JavaSurroundWithTest extends LightCodeInsightTestCase {
private static final String BASE_PATH = "/codeInsight/generation/surroundWith/java/";
@SuppressWarnings({"UnusedDeclaration"})
private enum SurroundType {
IF(new JavaWithIfSurrounder()), IF_ELSE(new JavaWithIfElseSurrounder()),
WHILE(new JavaWithWhileSurrounder()), DO_WHILE(new JavaWithDoWhileSurrounder()),
IF(new JavaWithIfSurrounder()),
IF_ELSE(new JavaWithIfElseSurrounder()),
WHILE(new JavaWithWhileSurrounder()),
DO_WHILE(new JavaWithDoWhileSurrounder()),
FOR(new JavaWithForSurrounder()),
TRY_CATCH(new JavaWithTryCatchSurrounder()), TRY_FINALLY(new JavaWithTryFinallySurrounder()),
TRY_CATCH(new JavaWithTryCatchSurrounder()),
TRY_FINALLY(new JavaWithTryFinallySurrounder()),
TRY_CATCH_FINALLY(new JavaWithTryCatchFinallySurrounder()),
SYNCHRONIZED(new JavaWithSynchronizedSurrounder()),
RUNNABLE(new JavaWithRunnableSurrounder()),
CODE_BLOCK(new JavaWithBlockSurrounder());
private final Surrounder mySurrounder;
@@ -68,7 +67,7 @@ public class JavaSurroundWithTest extends LightCodeInsightTestCase {
public Surrounder getSurrounder() {
return mySurrounder;
}
public String toFileName() {
StringBuilder result = new StringBuilder();
boolean capitalize = true;
@@ -88,7 +87,7 @@ public class JavaSurroundWithTest extends LightCodeInsightTestCase {
return result.toString();
}
}
public void testCommentAsFirstSurroundStatement() throws Exception {
String template = "CommentAsFirst%sSurroundStatement";
for (SurroundType type : SurroundType.values()) {
@@ -135,7 +134,7 @@ public class JavaSurroundWithTest extends LightCodeInsightTestCase {
TemplateManagerImpl.setTemplateTesting(getProject(), getTestRootDisposable());
doTest(new JavaWithNullCheckSurrounder());
}
public void testSurroundExpressionWithIf() {
TemplateManagerImpl.setTemplateTesting(getProject(), getTestRootDisposable());
doTest(new JavaWithIfExpressionSurrounder());
@@ -145,17 +144,17 @@ public class JavaSurroundWithTest extends LightCodeInsightTestCase {
TemplateManagerImpl.setTemplateTesting(getProject(), getTestRootDisposable());
doTest(new JavaWithIfExpressionSurrounder());
}
public void testSurroundExpressionWithNotForBoxedBooleans() {
TemplateManagerImpl.setTemplateTesting(getProject(), getTestRootDisposable());
doTest(new JavaWithNotSurrounder());
}
public void testSurroundExpressionWithElseIf() {
TemplateManagerImpl.setTemplateTesting(getProject(), getTestRootDisposable());
doTest(new JavaWithIfExpressionSurrounder());
}
public void testSurroundExpressionWithElseIfElse() {
TemplateManagerImpl.setTemplateTesting(getProject(), getTestRootDisposable());
doTest(new JavaWithIfElseExpressionSurrounder());
@@ -194,7 +193,7 @@ public class JavaSurroundWithTest extends LightCodeInsightTestCase {
doTest(new JavaWithBlockSurrounder());
}
public void testNoParenthesisSurrounderForLambdaParameter() throws Exception {
public void testNoParenthesisSurrounderForLambdaParameter() {
configureByFile(BASE_PATH + getTestName(false) + ".java");
SurroundDescriptor item = ContainerUtil.getFirstItem(LanguageSurrounders.INSTANCE.allForLanguage(JavaLanguage.INSTANCE));
@@ -207,10 +206,10 @@ public class JavaSurroundWithTest extends LightCodeInsightTestCase {
private void doTest(Surrounder surrounder) {
doTest(getTestName(false), surrounder);
}
private void doTest(@NotNull String fileName, final Surrounder surrounder) {
private void doTest(@NotNull String fileName, Surrounder surrounder) {
configureByFile(BASE_PATH + fileName + ".java");
SurroundDescriptor item = ContainerUtil.getFirstItem(LanguageSurrounders.INSTANCE.allForLanguage(JavaLanguage.INSTANCE));
assertNotNull(item);
SelectionModel selectionModel = getEditor().getSelectionModel();
@@ -221,8 +220,7 @@ public class JavaSurroundWithTest extends LightCodeInsightTestCase {
checkResultByFile(BASE_PATH + fileName + "_after.java");
}
private void doTestWithTemplateFinish(@NotNull String fileName, final Surrounder surrounder, @Nullable String textToType)
throws Exception {
private void doTestWithTemplateFinish(@NotNull String fileName, Surrounder surrounder, @Nullable String textToType) {
TemplateManagerImpl.setTemplateTesting(getProject(), getTestRootDisposable());
configureByFile(BASE_PATH + fileName + ".java");
SurroundWithHandler.invoke(getProject(), getEditor(), getFile(), surrounder);
java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy
+29 -31
View File
@@ -39,21 +39,21 @@ import static com.intellij.codeInsight.template.Template.Property.USE_STATIC_IMP
/**
* @author spleaner
*/
@SuppressWarnings("SpellCheckingInspection")
public class LiveTemplateTest extends LightCodeInsightFixtureTestCase {
@Override
protected String getBasePath() {
return JavaTestUtil.getRelativeJavaTestDataPath() + "/codeInsight/template/";
}
@Override
protected void setUp() throws Exception {
protected void setUp() {
super.setUp();
TemplateManagerImpl.setTemplateTesting(getProject(), getTestRootDisposable());
}
@Override
protected void tearDown() throws Exception {
protected void tearDown() {
CodeInsightSettings.instance.COMPLETION_CASE_SENSITIVE = CodeInsightSettings.FIRST_LETTER
CodeInsightSettings.instance.SELECT_AUTOPOPUP_SUGGESTIONS_BY_CHARS = false
if (state != null) {
@@ -132,7 +132,7 @@ public class LiveTemplateTest extends LightCodeInsightFixtureTestCase {
doTestTemplateWithArg("tst#", 'wrap($ARG$)', "tst# arg<caret>", "tst# arg");
}
public void testTemplateAtEndOfFile() throws Exception {
public void testTemplateAtEndOfFile() {
configureFromFileText("empty.java", "");
final TemplateManager manager = TemplateManager.getInstance(getProject());
final Template template = manager.createTemplate("empty", "user", '$VAR$');
@@ -142,7 +142,7 @@ public class LiveTemplateTest extends LightCodeInsightFixtureTestCase {
checkResultByText("");
}
public void testTemplateWithEnd() throws Exception {
public void testTemplateWithEnd() {
configureFromFileText("empty.java", "");
final TemplateManager manager = TemplateManager.getInstance(getProject());
final Template template = manager.createTemplate("empty", "user", '$VAR$$END$');
@@ -153,8 +153,8 @@ public class LiveTemplateTest extends LightCodeInsightFixtureTestCase {
myFixture.type("foo");
checkResultByText("foo");
}
public void testTemplateWithIndentedEnd() throws Exception {
public void testTemplateWithIndentedEnd() {
configureFromFileText("empty.java", "class C {\n" +
" bar() {\n" +
" <caret>\n" +
@@ -176,7 +176,7 @@ public class LiveTemplateTest extends LightCodeInsightFixtureTestCase {
}
public void testTemplateWithEndOnEmptyLine() throws Exception {
public void testTemplateWithEndOnEmptyLine() {
configureFromFileText("empty.java", "class C {\n" +
" bar() {\n" +
" <caret>\n" +
@@ -205,7 +205,7 @@ public class LiveTemplateTest extends LightCodeInsightFixtureTestCase {
myFixture.configureByText(name, text);
}
public void testEndInTheMiddle() throws Exception {
public void testEndInTheMiddle() {
configure();
final TemplateManager manager = TemplateManager.getInstance(getProject());
final Template template = manager.createTemplate("frm", "user", "javax.swing.JFrame frame = new javax.swing.JFrame();\n" +
@@ -291,7 +291,7 @@ class Foo {
state.gotoEnd();
checkResult();
}
def startTemplate(String name, char expandKey) {
myFixture.type(name)
myFixture.type(expandKey)
@@ -373,7 +373,7 @@ class Foo {
checkResult();
}
public void _testIterForceBraces() {
public void "_testIterForceBraces"() {
CodeStyleSettingsManager.getSettings(getProject()).IF_BRACE_FORCE = CommonCodeStyleSettings.FORCE_BRACES_ALWAYS;
try {
@@ -427,7 +427,7 @@ class Foo {
checkResult();
}
public void testJavaStatementContext() throws Exception {
public void testJavaStatementContext() {
final TemplateImpl template = TemplateSettings.getInstance().getTemplate("inst", "other");
assertFalse(isApplicable("class Foo {{ if (a inst<caret>) }}", template));
assertTrue(isApplicable("class Foo {{ <caret>inst }}", template));
@@ -441,7 +441,7 @@ class Foo {
assertTrue(isApplicable("class Foo {{ Runnable r = () -> <caret>System.out.println(\"foo\"); ) }}", template));
}
public void testJavaExpressionContext() throws Exception {
public void testJavaExpressionContext() {
final TemplateImpl template = TemplateSettings.getInstance().getTemplate("toar", "other");
assertFalse(isApplicable("class Foo {{ if (a <caret>toar) }}", template));
assertTrue(isApplicable("class Foo {{ <caret>toar }}", template));
@@ -451,7 +451,7 @@ class Foo {
assertTrue(isApplicable("class Foo {{ Runnable r = () -> <caret>System.out.println(\"foo\"); ) }}", template));
}
public void testJavaDeclarationContext() throws Exception {
public void testJavaDeclarationContext() {
final TemplateImpl template = TemplateSettings.getInstance().getTemplate("psvm", "other");
assertFalse(isApplicable("class Foo {{ <caret>xxx }}", template));
assertFalse(isApplicable("class Foo {{ <caret>xxx }}", template));
@@ -491,7 +491,7 @@ class Foo {
}
@Override
protected void invokeTestRunnable(@NotNull final Runnable runnable) throws Exception {
protected void invokeTestRunnable(@NotNull final Runnable runnable) {
if (name in ["testNavigationActionsDontTerminateTemplate", "testTemplateWithEnd", "testDisappearingVar",
"test do replace macro value with empty result",
"test do not replace macro value with null result",
@@ -683,8 +683,8 @@ class Outer {
myFixture.configureByText 'a.java', '''
import java.util.*;
class Foo {
List<Map.Entry<String, Integer>> foo() {
<caret>
List<Map.Entry<String, Integer>> foo() {
<caret>
}
}
'''
@@ -748,8 +748,8 @@ class Foo {
}
public void "test reuse static import"() {
myFixture.addClass("""package foo;
public class Bar {
myFixture.addClass("""package foo;
public class Bar {
public static void someMethod() {}
public static void someMethod(int a) {}
}""")
@@ -869,7 +869,7 @@ class Foo {
myFixture.checkResult """\
class Foo {
{
<caret> a.java
<caret> a.java """ + """
}
}
"""
@@ -883,7 +883,7 @@ class Foo {
}
"""
}
public void "test do replace macro value with empty result"() {
myFixture.configureByText "a.java", """\
class Foo {
@@ -903,7 +903,7 @@ class Foo {
myFixture.checkResult """\
class Foo {
{
<caret>
<caret> """ + """
}
}
"""
@@ -920,7 +920,7 @@ class Foo {
myFixture.checkResult """\
class Foo {
{
<caret>
<caret> """ + """
}
}
"""
@@ -946,7 +946,7 @@ class Foo {
@Override
Result calculateResult(@NotNull Expression[] params, ExpressionContext context) {
def state = TemplateManagerImpl.getTemplateState(context.editor)
return state != null ? state.getVariableValue(myVariableName) : null
return state != null ? state.getVariableValue(myVariableName) : null
}
@Override
@@ -982,10 +982,9 @@ class Foo {
}
}
""")
}
public void "test multicaret expanding with enter"() {
public void "test multicaret expanding with enter"() {
myFixture.configureByText "a.java", """\
class Foo {
{
@@ -1012,10 +1011,9 @@ class Foo {
}
}
""")
}
public void "test multicaret expanding with tab"() {
public void "test multicaret expanding with tab"() {
myFixture.configureByText "a.java", """\
class Foo {
{
@@ -1033,7 +1031,7 @@ class Foo {
finally {
TemplateSettings.instance.defaultShortcutChar = defaultShortcutChar
}
myFixture.checkResult("""\
class Foo {
{