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

cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2013-04-25 11:58:48 +04:00
parent 0cf02329e1
commit 2ee9530e56
6 changed files with 36 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spellchecker/src/com/intellij/spellchecker/BaseSuggestionProvider.java
+6 -6
View File
@@ -31,6 +31,7 @@ public class BaseSuggestionProvider implements SuggestionProvider {
this.manager = manager;
}
@Override
@NotNull
public List<String> getSuggestions(@NotNull String text) {
@@ -42,25 +43,24 @@ public class BaseSuggestionProvider implements SuggestionProvider {
for (String word : words) {
int start = text.indexOf(word, index);
int end = start + word.length();
if (!manager.hasProblem(word)) {
List<String> variants = new ArrayList<String>();
variants.add(word);
if (manager.hasProblem(word)) {
List<String> variants = manager.getRawSuggestions(word);
res[i++] = variants;
}
else {
List<String> variants = manager.getRawSuggestions(word);
List<String> variants = new ArrayList<String>();
variants.add(word);
res[i++] = variants;
}
index = end;
}
String[] all;
int[] counter = new int[i];
int size = 1;
for (int j = 0; j < i; j++) {
size *= res[j].size();
}
all = new String[size];
String[] all = new String[size];
for (int k = 0; k < size; k++) {
for (int j = 0; j < i; j++) {
spellchecker/src/com/intellij/spellchecker/SpellCheckerManager.java
+1 -7
View File
@@ -238,13 +238,7 @@ public class SpellCheckerManager {
Strings.upperCase(suggestions);
}
}
List<String> result = new ArrayList<String>();
for (String s : suggestions) {
if (!result.contains(s)) {
result.add(s);
}
}
return result;
return new ArrayList<String>(new LinkedHashSet<String>(suggestions));
}
return Collections.emptyList();
}
spellchecker/src/com/intellij/spellchecker/StreamLoader.java
+2
View File
@@ -35,10 +35,12 @@ public class StreamLoader implements Loader {
this.name=name;
}
@Override
public String getName() {
return name;
}
@Override
public void load(@NotNull Consumer<String> consumer) {
DataInputStream in = new DataInputStream(stream);
BufferedReader br = null;
spellchecker/src/com/intellij/spellchecker/engine/BaseSpellChecker.java
+20 -25
View File
@@ -60,6 +60,7 @@ public class BaseSpellChecker implements SpellCheckerEngine {
}
@Override
public void loadDictionary(@NotNull Loader loader) {
if (loader instanceof EditableDictionaryLoader) {
final EditableDictionary dictionary = ((EditableDictionaryLoader)loader).getDictionary();
@@ -75,9 +76,7 @@ public class BaseSpellChecker implements SpellCheckerEngine {
private void loadCompressedDictionary(@NotNull Loader loader) {
if (ApplicationManager.getApplication().isUnitTestMode() || ApplicationManager.getApplication().isHeadlessEnvironment()) {
final CompressedDictionary dictionary = CompressedDictionary.create(loader, transform);
if (dictionary != null) {
addCompressedFixedDictionary(dictionary);
}
addCompressedFixedDictionary(dictionary);
}
else {
loadDictionaryAsync(loader, new Consumer<Dictionary>() {
@@ -121,20 +120,16 @@ public class BaseSpellChecker implements SpellCheckerEngine {
public void run(@NotNull ProgressIndicator indicator) {
indicator.setText(String.format("Loading %s...", loader.getName()));
final CompressedDictionary dictionary = CompressedDictionary.create(loader, transform);
if (dictionary != null) {
LOG.debug(loader.getName() + " loaded!");
consumer.consume(dictionary);
}
LOG.debug(loader.getName() + " loaded!");
consumer.consume(dictionary);
while (!myDictionariesToLoad.isEmpty()) {
final Pair<Loader, Consumer<Dictionary>> nextDictionary = myDictionariesToLoad.remove(0);
Loader nextDictionaryLoader = nextDictionary.getFirst();
indicator.setText(String.format("Loading %s...", nextDictionaryLoader.getName()));
CompressedDictionary dictionary1 = CompressedDictionary.create(nextDictionaryLoader, transform);
if (dictionary1 != null) {
LOG.debug(nextDictionaryLoader.getName() + " loaded!");
nextDictionary.getSecond().consume(dictionary1);
}
LOG.debug(nextDictionaryLoader.getName() + " loaded!");
nextDictionary.getSecond().consume(dictionary1);
}
LOG.debug("Loading finished, restarting daemon...");
@@ -186,36 +181,30 @@ public class BaseSpellChecker implements SpellCheckerEngine {
bundledDictionaries.add(dictionary);
}
@Override
public Transformation getTransformation() {
return transform;
}
@NotNull
private static List<String> restore(char startFrom, int i, int j, @Nullable Collection dictionaries) {
if (dictionaries == null) {
return Collections.emptyList();
}
private static List<String> restore(char startFrom, int i, int j, @NotNull Collection<? extends Dictionary> dictionaries) {
List<String> results = new ArrayList<String>();
for (Object o : dictionaries) {
if (o instanceof Dictionary) {
results.addAll(restore(startFrom, i, j, (Dictionary)o));
}
for (Dictionary o : dictionaries) {
results.addAll(restore(startFrom, i, j, o));
}
return results;
}
@NotNull
private static List<String> restore(final char first, final int i, final int j, @Nullable Dictionary dictionary) {
if (dictionary == null) {
return Collections.emptyList();
}
private static List<String> restore(final char first, final int i, final int j, @NotNull Dictionary dictionary) {
final List<String> result = new ArrayList<String>();
if (dictionary instanceof CompressedDictionary) {
result.addAll(((CompressedDictionary)dictionary).getWords(first));
result.addAll(((CompressedDictionary)dictionary).getWords(first, i, j));
}
else {
dictionary.traverse(new Consumer<String>() {
@Override
public void consume(String s) {
if (StringUtil.isEmpty(s)) {
return;
@@ -254,6 +243,7 @@ public class BaseSpellChecker implements SpellCheckerEngine {
return -1;
}
@Override
public boolean isCorrect(@NotNull String word) {
//System.out.println("---\n"+word);
final String transformed = transform.transform(word);
@@ -268,8 +258,9 @@ public class BaseSpellChecker implements SpellCheckerEngine {
}
@Override
@NotNull
public List<String> getSuggestions(final @NotNull String word, int threshold, int quality) {
public List<String> getSuggestions(@NotNull final String word, int threshold, int quality) {
final String transformed = transform.transform(word);
if (transformed == null) {
return Collections.emptyList();
@@ -298,6 +289,7 @@ public class BaseSpellChecker implements SpellCheckerEngine {
}
@Override
@NotNull
public List<String> getVariants(@NotNull String prefix) {
//if (StringUtil.isEmpty(prefix)) {
@@ -306,15 +298,18 @@ public class BaseSpellChecker implements SpellCheckerEngine {
}
@Override
public void reset() {
bundledDictionaries.clear();
dictionaries.clear();
}
@Override
public boolean isDictionaryLoad(@NotNull String name) {
return getBundledDictionaryByName(name) != null;
}
@Override
public void removeDictionary(@NotNull String name) {
final Dictionary dictionaryByName = getBundledDictionaryByName(name);
if (dictionaryByName != null) {
spellchecker/src/com/intellij/spellchecker/inspections/SpellCheckingInspection.java
+4 -4
View File
@@ -260,12 +260,12 @@ public class SpellCheckingInspection extends LocalInspectionTool implements Cust
boolean hasProblems = myManager.hasProblem(word);
if (hasProblems) {
if (!myHolder.isOnTheFly()) {
myAlreadyChecked.add(word);
addBatchDescriptor(myElement, myOffset, textRange, myHolder);
if (myHolder.isOnTheFly()) {
addRegularDescriptor(myElement, myOffset, textRange, myHolder, myUseRename, word);
}
else {
addRegularDescriptor(myElement, myOffset, textRange, myHolder, myUseRename, word);
myAlreadyChecked.add(word);
addBatchDescriptor(myElement, myOffset, textRange, myHolder);
}
}
}
spellchecker/src/com/intellij/spellchecker/quickfixes/DictionarySuggestionProvider.java
+3 -5
View File
@@ -22,11 +22,10 @@ import com.intellij.refactoring.rename.PreferrableNameSuggestionProvider;
import com.intellij.spellchecker.SpellCheckerManager;
import java.util.Set;
import java.util.TreeSet;
public class DictionarySuggestionProvider extends PreferrableNameSuggestionProvider {
private boolean active;
public void setActive(boolean active) {
@@ -38,6 +37,7 @@ public class DictionarySuggestionProvider extends PreferrableNameSuggestionProvi
return !active;
}
@Override
public SuggestedNameInfo getSuggestedNames(PsiElement element, PsiElement nameSuggestionContext, Set<String> result) {
assert result != null;
if (!active || nameSuggestionContext==null) {
@@ -54,9 +54,7 @@ public class DictionarySuggestionProvider extends PreferrableNameSuggestionProvi
SpellCheckerManager manager = SpellCheckerManager.getInstance(element.getProject());
Set<String> set = new TreeSet<String>();
set.addAll(manager.getSuggestions(text));
result.addAll(set);
result.addAll(manager.getSuggestions(text));
return SuggestedNameInfo.NULL_INFO;
}
}