GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-20 16:42:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix GWT client-side completion caching bug. Typing a space and then a letter quickly would cause the first request to be cancelled, and the second would use the two steps old results, which didn't go past the space => 0 completions.

Browse Source
This commit is contained in:
bjorn
2008-11-03 21:07:53 +00:00
parent d6f09a941f
commit 3a6466ac1a
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/server/gwt/src/se/chalmers/cs/gf/gwt/client/CompletionOracle.java
View File

@@ -40,12 +40,21 @@ public class CompletionOracle extends SuggestOracle {
public void setGrammarName(String pgfName) { public void setGrammarName(String pgfName) {
this.pgfName = pgfName; this.pgfName = pgfName;
clearState();
} }
public void setInputLangs(List<String> inputLangs) { public void setInputLangs(List<String> inputLangs) {
this.inputLangs = inputLangs; this.inputLangs = inputLangs;
clearState();
}
private void clearState () {
this.oldQuery = null; this.oldQuery = null;
this.oldSuggestions = Collections.emptyList(); this.oldSuggestions = Collections.emptyList();
if (jsonRequest != null) {
jsonRequest.cancel();
jsonRequest = null;
}
} }
public List<String> getInputLangs() { public List<String> getInputLangs() {
@@ -76,10 +85,11 @@ public class CompletionOracle extends SuggestOracle {
} }
public void requestSuggestions(SuggestOracle.Request request, SuggestOracle.Callback callback) { public void requestSuggestions(SuggestOracle.Request request, SuggestOracle.Callback callback) {
// Only allow a single completion request at a time // Only allow a single completion request at a time
if (jsonRequest != null) if (jsonRequest != null) {
jsonRequest.cancel(); jsonRequest.cancel();
jsonRequest = null;
}
List<CompletionSuggestion> suggestions = filterOldSuggestions(request); List<CompletionSuggestion> suggestions = filterOldSuggestions(request);
if (suggestions != null) { if (suggestions != null) {
@@ -93,13 +103,14 @@ public class CompletionOracle extends SuggestOracle {
private List<CompletionSuggestion> filterOldSuggestions(SuggestOracle.Request request) { private List<CompletionSuggestion> filterOldSuggestions(SuggestOracle.Request request) {
String query = request.getQuery(); String query = request.getQuery();
if (query.length() > 0 && oldQuery != null && query.startsWith(oldQuery)) { if (query.length() > 0 && oldQuery != null && query.startsWith(oldQuery)) {
// If the prefix had no completions, so there is no way that the current input will. // If the prefix had no completions, there is no way that the current input will.
if (oldSuggestions.isEmpty()) { if (oldSuggestions.isEmpty()) {
return Collections.emptyList(); return Collections.emptyList();
} }
// If the input ends in whitespace, always get completions from the server, // If the new input since the previous query ends in whitespace,
// always get completions from the server,
// since the old suggestions won't include the next word. // since the old suggestions won't include the next word.
if (query.charAt(query.length() - 1) == ' ') { if (query.indexOf(' ', oldQuery.length()) != -1) {
return null; return null;
} }
List<CompletionSuggestion> suggestions = new ArrayList<CompletionSuggestion>(); List<CompletionSuggestion> suggestions = new ArrayList<CompletionSuggestion>();
@@ -122,6 +133,7 @@ public class CompletionOracle extends SuggestOracle {
jsonRequest = pgf.complete(getGrammarName(), request.getQuery(), getInputLangs(), null, LIMIT_SCALE_FACTOR * request.getLimit(), jsonRequest = pgf.complete(getGrammarName(), request.getQuery(), getInputLangs(), null, LIMIT_SCALE_FACTOR * request.getLimit(),
new PGF.CompleteCallback() { new PGF.CompleteCallback() {
public void onResult(PGF.Completions completions) { public void onResult(PGF.Completions completions) {
jsonRequest = null;
List<CompletionSuggestion> suggestions = new ArrayList<CompletionSuggestion>(); List<CompletionSuggestion> suggestions = new ArrayList<CompletionSuggestion>();
for (PGF.Completion completion : completions.iterable()) { for (PGF.Completion completion : completions.iterable()) {
suggestions.add(new CompletionSuggestion(completion.getText())); suggestions.add(new CompletionSuggestion(completion.getText()));