diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-05-31 07:45:51 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-05-31 07:45:51 -0700 |
| commit | ec3fb1e06285c0467a7a20360ca80453bc7635d4 (patch) | |
| tree | 2402cdec34611f34b8385ff45387d6734bf6f994 /RegExpSupport | |
| parent | a6eac331b3d9f0d4168b12356ea256c83f4e9c05 (diff) | |
| download | idea-ec3fb1e06285c0467a7a20360ca80453bc7635d4.tar.gz | |
Snapshot 568f05589922685b8c8f9a2f2f465043b8128542 from master branch of git://git.jetbrains.org/idea/community.git
Change-Id: I47fe8cb5d8a3c9876cd4c313dca1a8cc531288ec
Diffstat (limited to 'RegExpSupport')
| -rw-r--r-- | RegExpSupport/RegExpSupport.iml | 1 | ||||
| -rw-r--r-- | RegExpSupport/src/org/intellij/lang/regexp/surroundWith/SimpleSurroundDescriptor.java | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/RegExpSupport/RegExpSupport.iml b/RegExpSupport/RegExpSupport.iml index 6fa1ddeb73d2..355cc42fcd21 100644 --- a/RegExpSupport/RegExpSupport.iml +++ b/RegExpSupport/RegExpSupport.iml @@ -19,7 +19,6 @@ <orderEntry type="module" module-name="relaxng" scope="RUNTIME" /> <orderEntry type="module" module-name="spellchecker" scope="RUNTIME" /> <orderEntry type="module" module-name="xdebugger-impl" scope="RUNTIME" /> - <orderEntry type="module" module-name="resources" scope="TEST" /> </component> </module> diff --git a/RegExpSupport/src/org/intellij/lang/regexp/surroundWith/SimpleSurroundDescriptor.java b/RegExpSupport/src/org/intellij/lang/regexp/surroundWith/SimpleSurroundDescriptor.java index 8c6d85687f1a..30c39945ad30 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/surroundWith/SimpleSurroundDescriptor.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/surroundWith/SimpleSurroundDescriptor.java @@ -19,7 +19,7 @@ import com.intellij.lang.surroundWith.SurroundDescriptor; import com.intellij.lang.surroundWith.Surrounder; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -83,7 +83,7 @@ public class SimpleSurroundDescriptor implements SurroundDescriptor { } if (startOffset == endOffset && atoms.size() > 0) { - final PsiElement[] elements = PsiUtilBase.toPsiElementArray(atoms); + final PsiElement[] elements = PsiUtilCore.toPsiElementArray(atoms); if ((atoms.size() == 1 || PsiTreeUtil.findCommonParent(elements) == elements[0].getParent())) { return elements; } |