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

search in strings option works correctly for Python refactorings (PY-670)

Browse Source
This commit is contained in:
Dmitry Jemerov
2010-03-16 17:20:54 +03:00
parent 24cb0b4591
commit 8a05e03de3
4 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/PythonParserDefinition.java
+3 -1
View File
@@ -28,12 +28,14 @@ public class PythonParserDefinition implements ParserDefinition {
private final TokenSet myWhitespaceTokens;
private final TokenSet myCommentTokens;
private final TokenSet myStringLiteralTokens;
public PythonParserDefinition() {
language = (PythonLanguage)PythonFileType.INSTANCE.getLanguage();
myWhitespaceTokens = TokenSet.create(PyTokenTypes.LINE_BREAK, PyTokenTypes.SPACE, PyTokenTypes.TAB, PyTokenTypes.FORMFEED);
myCommentTokens = TokenSet.create(PyTokenTypes.END_OF_LINE_COMMENT);
myStringLiteralTokens = TokenSet.create(PyTokenTypes.STRING_LITERAL);
}
@NotNull
@@ -57,7 +59,7 @@ public class PythonParserDefinition implements ParserDefinition {
@NotNull
public TokenSet getStringLiteralElements() {
return TokenSet.EMPTY;
return myStringLiteralTokens;
}
@NotNull
python/testData/refactoring/rename/searchInStrings.py
+3
View File
@@ -0,0 +1,3 @@
def f<caret>oo():
'this is method foo'
pass
python/testData/refactoring/rename/searchInStrings_after.py
+3
View File
@@ -0,0 +1,3 @@
def bar():
'this is method bar'
pass
python/testSrc/com/jetbrains/python/refactoring/PyRenameTest.java
+11
View File
@@ -1,5 +1,7 @@
package com.jetbrains.python.refactoring;
import com.intellij.codeInsight.TargetElementUtilBase;
import com.intellij.psi.PsiElement;
import com.jetbrains.python.fixtures.PyLightFixtureTestCase;
/**
@@ -11,4 +13,13 @@ public class PyRenameTest extends PyLightFixtureTestCase {
myFixture.renameElementAtCaret("qu");
myFixture.checkResultByFile("refactoring/rename/" + getTestName(true) + "_after.py");
}
public void testSearchInStrings() throws Exception { // PY-670
myFixture.configureByFile("refactoring/rename/" + getTestName(true) + ".py");
final PsiElement element = TargetElementUtilBase.findTargetElement(myFixture.getEditor(), TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED |
TargetElementUtilBase.ELEMENT_NAME_ACCEPTED);
assertNotNull(element);
myFixture.renameElement(element, "bar", true, false);
myFixture.checkResultByFile("refactoring/rename/" + getTestName(true) + "_after.py");
}
}