diff --git a/platform/platform-api/src/com/intellij/openapi/editor/TextLineWrapPositionStrategy.java b/platform/platform-api/src/com/intellij/openapi/editor/TextLineWrapPositionStrategy.java deleted file mode 100644 index 21e232a1c038..000000000000 --- a/platform/platform-api/src/com/intellij/openapi/editor/TextLineWrapPositionStrategy.java +++ /dev/null @@ -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)); - } -} diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml index c5d6f14e298d..497fff0ed020 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml @@ -429,8 +429,6 @@ - - diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/DefaultLineWrapPositionStrategyTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/DefaultLineWrapPositionStrategyTest.java index ab9351e25123..3b229ae8cbc4 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/DefaultLineWrapPositionStrategyTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/DefaultLineWrapPositionStrategyTest.java @@ -58,4 +58,11 @@ public class DefaultLineWrapPositionStrategyTest extends AbstractLineWrapPositio "--------------------------------------------------------------------------"; doTest(myStrategy, document); } + + @Test + public void preferNearestWhiteSpaceWrap_InsteadOf_Comma() { + String document = + "queueing the JSON for later submission, we retain the SimpleRequestData"; + doTest(myStrategy, document, false); + } } diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/TextLineWrapPositionStrategyTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/TextLineWrapPositionStrategyTest.java deleted file mode 100644 index 7d43d7954ada..000000000000 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/TextLineWrapPositionStrategyTest.java +++ /dev/null @@ -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 SimpleRequestData"; - doTest(myStrategy, document, false); - } - -}