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

Remove unnecessary "TextLineWrapPositionStrategy"

Browse Source 
It has the same logic as "DefaultLineWrapPositionStrategy".
Corresponding tests moved to "DefaultLineWrapPositionStrategyTest".
This commit is contained in:
Konstantin Kolosovsky
2017-04-25 16:19:57 +03:00
parent 66dce364ad
commit 362be70c8e
4 changed files with 7 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/editor/TextLineWrapPositionStrategy.java
-36
View File
@@ -1,36 +0,0 @@
/*
* Copyright 2000-2014 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.openapi.editor;
public class TextLineWrapPositionStrategy extends GenericLineWrapPositionStrategy {
public TextLineWrapPositionStrategy() {
// Commas.
addRule(new Rule(',', WrapCondition.AFTER, Rule.DEFAULT_WEIGHT));
// Symbols to wrap either before or after.
addRule(new Rule(' '));
addRule(new Rule('\t'));
// Symbols to wrap after.
addRule(new Rule(';', WrapCondition.AFTER));
addRule(new Rule(')', WrapCondition.AFTER));
// Symbols to wrap before
addRule(new Rule('(', WrapCondition.BEFORE));
addRule(new Rule('.', WrapCondition.BEFORE));
}
}
platform/platform-resources/src/META-INF/PlatformExtensions.xml
-2
View File
@@ -429,8 +429,6 @@
<fileDocumentSynchronizationVetoer implementation="com.intellij.openapi.fileEditor.impl.LargeFileSavingVetoer"/>
<frameEditorComponentProvider implementation="com.intellij.openapi.wm.ex.DefaultFrameEditorComponentProvider"/>
<lang.lineWrapStrategy language="TEXT" implementationClass="com.intellij.openapi.editor.TextLineWrapPositionStrategy"/>
<editorNotificationProvider implementation="com.intellij.openapi.editor.impl.ForcedSoftWrapsNotificationProvider"/>
<editorNotificationProvider implementation="com.intellij.ide.FileChangedNotificationProvider"/>
<editorNotificationProvider implementation="com.intellij.openapi.updateSettings.impl.pluginsAdvertisement.PluginAdvertiserEditorNotificationProvider"/>
platform/platform-tests/testSrc/com/intellij/openapi/editor/DefaultLineWrapPositionStrategyTest.java
+7
View File
@@ -58,4 +58,11 @@ public class DefaultLineWrapPositionStrategyTest extends AbstractLineWrapPositio
"-----------------<EDGE>---------------------------------------------------------";
doTest(myStrategy, document);
}
@Test
public void preferNearestWhiteSpaceWrap_InsteadOf_Comma() {
String document =
"queueing the JSON for later submission, we retain the <WRAP>SimpleRequestDa<EDGE>ta";
doTest(myStrategy, document, false);
}
}
platform/platform-tests/testSrc/com/intellij/openapi/editor/TextLineWrapPositionStrategyTest.java
-37
View File
@@ -1,37 +0,0 @@
/*
* Copyright 2000-2014 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.openapi.editor;
import org.junit.Before;
import org.junit.Test;
public class TextLineWrapPositionStrategyTest extends AbstractLineWrapPositionStrategyTest {
private LineWrapPositionStrategy myStrategy;
@Before
public void setUp() {
super.setUp();
myStrategy = new TextLineWrapPositionStrategy();
}
@Test
public void preferNearestWhiteSpaceWrap_InsteadOf_Comma() {
String document =
"queueing the JSON for later submission, we retain the <WRAP>SimpleRequestDa<EDGE>ta";
doTest(myStrategy, document, false);
}
}