diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/ExtendWordSelectionHandlerBase.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/ExtendWordSelectionHandlerBase.java
index d559f635982e..b16f7ee0c59e 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/ExtendWordSelectionHandlerBase.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/ExtendWordSelectionHandlerBase.java
@@ -16,6 +16,7 @@
 
 package com.intellij.codeInsight.editorActions;
 
+import com.google.common.collect.Lists;
 import com.intellij.psi.PsiElement;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.editor.Editor;
@@ -39,7 +40,7 @@ public abstract class ExtendWordSelectionHandlerBase implements ExtendWordSelect
       ranges = expandToWholeLine(editorText, originalRange, false);
     }
 
-    List<TextRange> result = new ArrayList<TextRange>();
+    List<TextRange> result = Lists.newArrayList();
     result.addAll(ranges);
     return result;
   }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/wordSelection/AbstractWordSelectioner.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/wordSelection/AbstractWordSelectioner.java
index 6cd5c33a9a35..4df3b82d08ce 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/wordSelection/AbstractWordSelectioner.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/wordSelection/AbstractWordSelectioner.java
@@ -16,6 +16,7 @@
 
 package com.intellij.codeInsight.editorActions.wordSelection;
 
+import com.google.common.collect.Lists;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiElement;
@@ -39,7 +40,7 @@ public abstract class AbstractWordSelectioner extends ExtendWordSelectionHandler
       ranges = super.select(e, editorText, cursorOffset, editor);
     }
     else {
-      ranges = new ArrayList<TextRange>();
+      ranges = Lists.newArrayList();
     }
     SelectWordUtil.addWordSelection(editor.getSettings().isCamelWords(), editorText, cursorOffset, ranges);
     return ranges;
diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/HtmlSelectioner.java b/xml/impl/src/com/intellij/codeInsight/editorActions/HtmlSelectioner.java
index f9871a6aac2b..af90b65b2e8a 100644
--- a/xml/impl/src/com/intellij/codeInsight/editorActions/HtmlSelectioner.java
+++ b/xml/impl/src/com/intellij/codeInsight/editorActions/HtmlSelectioner.java
@@ -24,6 +24,7 @@
  */
 package com.intellij.codeInsight.editorActions;
 
+import com.google.common.collect.Lists;
 import com.intellij.codeInsight.editorActions.wordSelection.AbstractWordSelectioner;
 import com.intellij.codeInsight.highlighting.BraceMatchingUtil;
 import com.intellij.ide.highlighter.HighlighterFactory;
@@ -73,7 +74,7 @@ public class HtmlSelectioner extends AbstractWordSelectioner {
       result = super.select(e, editorText, cursorOffset, editor);
     }
     else {
-      result = new ArrayList<TextRange>();
+      result = Lists.newArrayList();
     }
 
     if (ourStyleSelectioner != null) {
diff --git a/xml/impl/xml.iml b/xml/impl/xml.iml
index 352130f96034..4e6b806f01c7 100644
--- a/xml/impl/xml.iml
+++ b/xml/impl/xml.iml
@@ -17,6 +17,7 @@
     <orderEntry type="library" name="XmlBeans" level="project" />
     <orderEntry type="module" module-name="platform-resources" />
     <orderEntry type="module" module-name="vcs-api" />
+    <orderEntry type="library" name="Guava" level="project" />
   </component>
   <component name="copyright">
     <Base>