From 579d911b6091d3b6560beb443d32a038f1ffbbf6 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Tue, 5 Jul 2011 17:02:16 +0200
Subject: [PATCH] retrieving the word list in less LOC

---
 .../completion/WordCompletionContributor.java | 22 +++++++-
 .../psi/filters/getters/AllWordsGetter.java   | 52 -------------------
 2 files changed, 20 insertions(+), 54 deletions(-)
 delete mode 100644 platform/lang-impl/src/com/intellij/psi/filters/getters/AllWordsGetter.java

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/WordCompletionContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/WordCompletionContributor.java
index 1b4de9688e44..44929f78eb80 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/WordCompletionContributor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/WordCompletionContributor.java
@@ -21,15 +21,17 @@ import com.intellij.lang.ASTNode;
 import com.intellij.lang.LanguageWordCompletion;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.DumbService;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PlainTextTokenTypes;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiReference;
-import com.intellij.psi.filters.getters.AllWordsGetter;
+import com.intellij.psi.impl.cache.impl.id.IdTableBuilding;
 import com.intellij.psi.tree.IElementType;
 
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 import static com.intellij.patterns.StandardPatterns.character;
@@ -54,7 +56,7 @@ public class WordCompletionContributor extends CompletionContributor implements
                                                                                                             startOffset,
                                                                                                             character().javaIdentifierPart().andNot(character().equalTo('$')),
                                                                                                             character().javaIdentifierStart()));
-    for (final String word : AllWordsGetter.getAllWords(insertedElement, startOffset)) {
+    for (final String word : getAllWords(insertedElement, startOffset)) {
       if (!excludes.contains(word)) {
         final LookupElement item = LookupElementBuilder.create(word);
         javaResultSet.addElement(item);
@@ -106,4 +108,20 @@ public class WordCompletionContributor extends CompletionContributor implements
     return false;
   }
 
+  public static Set<String> getAllWords(final PsiElement context, final int offset) {
+    final Set<String> words = new LinkedHashSet<String>();
+    if (StringUtil.isEmpty(CompletionUtil.findJavaIdentifierPrefix(context, offset))) {
+      return words;
+    }
+
+    final CharSequence chars = context.getContainingFile().getViewProvider().getContents(); // ??
+    IdTableBuilding.scanWords(new IdTableBuilding.ScanWordProcessor() {
+      public void run(final CharSequence chars, final int start, final int end) {
+        if (start > offset || offset > end) {
+          words.add(chars.subSequence(start, end).toString());
+        }
+      }
+    }, chars, 0, chars.length());
+    return words;
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/psi/filters/getters/AllWordsGetter.java b/platform/lang-impl/src/com/intellij/psi/filters/getters/AllWordsGetter.java
deleted file mode 100644
index 3ec7aaf9c380..000000000000
--- a/platform/lang-impl/src/com/intellij/psi/filters/getters/AllWordsGetter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2000-2009 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.psi.filters.getters;
-
-import com.intellij.codeInsight.completion.CompletionContext;
-import com.intellij.codeInsight.completion.CompletionUtil;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.filters.ContextGetter;
-import com.intellij.psi.impl.cache.impl.id.IdTableBuilding;
-import com.intellij.util.ArrayUtil;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class AllWordsGetter implements ContextGetter {
-  public Object[] get(final PsiElement context, final CompletionContext completionContext) {
-    final int offset = completionContext.getStartOffset();
-    return getAllWords(context, offset);
-  }
-
-  public static String[] getAllWords(final PsiElement context, final int offset) {
-    if (StringUtil.isEmpty(CompletionUtil.findJavaIdentifierPrefix(context, offset))) {
-      return ArrayUtil.EMPTY_STRING_ARRAY;
-    }
-
-    final CharSequence chars = context.getContainingFile().getViewProvider().getContents(); // ??
-    final List<String> objs = new ArrayList<String>();
-    IdTableBuilding.scanWords(new IdTableBuilding.ScanWordProcessor() {
-      public void run(final CharSequence chars, final int start, final int end) {
-        if (start > offset || offset > end) {
-          objs.add(chars.subSequence(start, end).toString());
-        }
-      }
-    }, chars, 0, chars.length());
-    return ArrayUtil.toStringArray(objs);
-  }
-}