From 363b5a6fe9a474ca583a650905f15179a8181ab8 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 4 Nov 2013 12:51:09 +0100
Subject: [PATCH] select word works correctly inside escape sequence (PY-9014)

---
 python/src/META-INF/python-core.xml           |  1 +
 .../PyBasicWordSelectionFilter.java           | 35 +++++++++++++++++++
 .../selectWord/insideEscapeSequence/after1.py |  1 +
 .../selectWord/insideEscapeSequence/before.py |  1 +
 .../jetbrains/python/PySelectWordTest.java    |  4 +++
 5 files changed, 42 insertions(+)
 create mode 100644 python/src/com/jetbrains/python/editor/selectWord/PyBasicWordSelectionFilter.java
 create mode 100644 python/testData/selectWord/insideEscapeSequence/after1.py
 create mode 100644 python/testData/selectWord/insideEscapeSequence/before.py

diff --git a/python/src/META-INF/python-core.xml b/python/src/META-INF/python-core.xml
index bc7c48d106ff..6ec62ecdb190 100644
--- a/python/src/META-INF/python-core.xml
+++ b/python/src/META-INF/python-core.xml
@@ -49,6 +49,7 @@
     <extendWordSelectionHandler implementation="com.jetbrains.python.editor.selectWord.PyStatementSelectionHandler"/>
     <extendWordSelectionHandler implementation="com.jetbrains.python.editor.selectWord.PyListSelectionHandler"/>
     <extendWordSelectionHandler implementation="com.jetbrains.python.editor.selectWord.PyCommaSelectionHandler"/>
+    <basicWordSelectionFilter implementation="com.jetbrains.python.editor.selectWord.PyBasicWordSelectionFilter"/>
     <completion.contributor language="Python"
                             implementationClass="com.jetbrains.python.codeInsight.completion.PyKeywordCompletionContributor"/>
     <completion.contributor language="Python"
diff --git a/python/src/com/jetbrains/python/editor/selectWord/PyBasicWordSelectionFilter.java b/python/src/com/jetbrains/python/editor/selectWord/PyBasicWordSelectionFilter.java
new file mode 100644
index 000000000000..2d35a6e846a9
--- /dev/null
+++ b/python/src/com/jetbrains/python/editor/selectWord/PyBasicWordSelectionFilter.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2000-2013 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.jetbrains.python.editor.selectWord;
+
+import com.intellij.openapi.util.Condition;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.tree.IElementType;
+import com.jetbrains.python.PyTokenTypes;
+
+/**
+ * @author yole
+ */
+public class PyBasicWordSelectionFilter implements Condition<PsiElement> {
+  @Override
+  public boolean value(PsiElement element) {
+    IElementType elementType = element.getNode().getElementType();
+    if (PyTokenTypes.STRING_NODES.contains(elementType)) {
+      return false;
+    }
+    return true;
+  }
+}
diff --git a/python/testData/selectWord/insideEscapeSequence/after1.py b/python/testData/selectWord/insideEscapeSequence/after1.py
new file mode 100644
index 000000000000..decea81b8e4f
--- /dev/null
+++ b/python/testData/selectWord/insideEscapeSequence/after1.py
@@ -0,0 +1 @@
+s = 'Hello<selection>\n</selection>World!'
\ No newline at end of file
diff --git a/python/testData/selectWord/insideEscapeSequence/before.py b/python/testData/selectWord/insideEscapeSequence/before.py
new file mode 100644
index 000000000000..348c33349758
--- /dev/null
+++ b/python/testData/selectWord/insideEscapeSequence/before.py
@@ -0,0 +1 @@
+s = 'Hello\<caret>nWorld!'
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/PySelectWordTest.java b/python/testSrc/com/jetbrains/python/PySelectWordTest.java
index 0d043332488b..02fe335880df 100644
--- a/python/testSrc/com/jetbrains/python/PySelectWordTest.java
+++ b/python/testSrc/com/jetbrains/python/PySelectWordTest.java
@@ -50,6 +50,10 @@ public class PySelectWordTest extends PyTestCase {
     doTest();
   }
 
+  public void testInsideEscapeSequence() {  // PY-9014
+    doTest();
+  }
+
   private void doTest() {
     CodeInsightTestUtil.doWordSelectionTestOnDirectory(myFixture, "selectWord/" + getTestName(true), "py");
   }