Do now wrap on dot in ellipsis (IDEA-137107)

This commit is contained in:
Yaroslav Lepenkin
2015-03-04 12:07:42 +03:00
parent 0d7819283f
commit 81f905f18a
3 changed files with 72 additions and 1 deletions
@@ -0,0 +1,34 @@
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.psi.formatter.java;
import com.intellij.openapi.editor.DefaultLineWrapPositionStrategy;
import com.intellij.openapi.editor.Document;
import org.jetbrains.annotations.NotNull;
public class JavaLineWrapPositionStrategy extends DefaultLineWrapPositionStrategy {
@Override
protected boolean canUseOffset(@NotNull Document document, int offset, boolean virtual) {
CharSequence chars = document.getCharsSequence();
if (chars.charAt(offset) == '.') {
if (offset > 0 && chars.charAt(offset - 1) == '.' || offset + 1 < chars.length() && chars.charAt(offset + 1) == '.') {
return false;
}
}
return true;
}
}
@@ -0,0 +1,37 @@
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.psi.formatter.java;
import com.intellij.openapi.editor.AbstractLineWrapPositionStrategyTest;
import org.junit.Before;
import org.junit.Test;
public class JavaLineWrapTest extends AbstractLineWrapPositionStrategyTest {
private JavaLineWrapPositionStrategy myLineWrapStrategy;
@Override
@Before
public void setUp() {
super.setUp();
myLineWrapStrategy = new JavaLineWrapPositionStrategy();
}
@Test
public void testNoWrapOnVarArgs() throws Exception {
String document = "void method(String p1, String p2, Boolean b1, <WRAP>String...a<EDGE>rgs) {}";
doTest(myLineWrapStrategy, document, false);
}
}
+1 -1
View File
@@ -1053,7 +1053,7 @@
<codeStyleSettingsProvider implementation="com.intellij.application.options.GenerationSettingsProvider"/>
<langCodeStyleSettingsProvider implementation="com.intellij.ide.JavaLanguageCodeStyleSettingsProvider"/>
<lang.lineWrapStrategy language="JAVA" implementationClass="com.intellij.psi.formatter.java.JavaLineWrapPositionStrategy"/>
<stacktrace.fold substring="at java.awt.EventDispatchThread"/>
<stacktrace.fold substring="at java.awt.Window.dispatchEventImpl("/>