Prevent text substitutions for suggestions that are outdated (#442)

also clear pending flag once message has been submitted

actions/global_actions.jsx

@@ -275,11 +275,12 @@ export function emitSelectPreviousSuggestion(suggestionId) {
  });
 }
 
-export function emitCompleteWordSuggestion(suggestionId, term = '') {
+export function emitCompleteWordSuggestion(suggestionId, term = '', override = false) {
  AppDispatcher.handleViewAction({
  type: Constants.ActionTypes.SUGGESTION_COMPLETE_WORD,
  id: suggestionId,
- term
+ term,
+ override
  });
 }
 

components/suggestion/command_provider.jsx

@@ -36,6 +36,9 @@ export default class CommandProvider {
  handlePretextChanged(suggestionId, pretext) {
  if (pretext.startsWith('/')) {
  getSuggestedCommands(pretext.toLowerCase(), suggestionId, CommandSuggestion, pretext.toLowerCase());
+
+ return true;
  }
+ return false;
  }
 }

components/suggestion/suggestion_box.jsx

@@ -252,19 +252,27 @@ export default class SuggestionBox extends React.Component {
  const pretext = textbox.value.substring(0, textbox.selectionEnd);
 
  let prefix;
+ let keepPretext = false;
  if (pretext.endsWith(matchedPretext)) {
  prefix = pretext.substring(0, pretext.length - matchedPretext.length);
  } else {
  // the pretext has changed since we got a term to complete so see if the term still fits the pretext
  const termWithoutMatched = term.substring(matchedPretext.length);
  const overlap = SuggestionBox.findOverlap(pretext, termWithoutMatched);
 
+ keepPretext = overlap.length === 0;
  prefix = pretext.substring(0, pretext.length - overlap.length - matchedPretext.length);
  }
 
  const suffix = text.substring(caret);
 
- const newValue = prefix + term + ' ' + suffix;
+ let newValue;
+ if (keepPretext) {
+ newValue = pretext;
+ } else {
+ newValue = prefix + term + ' ' + suffix;
+ }
+
  this.refs.textbox.value = newValue;
 
  if (this.props.onChange) {
@@ -302,8 +310,11 @@ export default class SuggestionBox extends React.Component {
  provider.handleCompleteWord(term, matchedPretext);
  }
  }
+
+ // override if user finished typing term before results returned from API
  if (shouldEmitWordSuggestion) {
- GlobalActions.emitCompleteWordSuggestion(this.suggestionId);
+ const override = pretext.endsWith(term);
+ GlobalActions.emitCompleteWordSuggestion(this.suggestionId, '', override);
  }
  }
 
@@ -337,6 +348,10 @@ export default class SuggestionBox extends React.Component {
  let handled = false;
  for (const provider of this.props.providers) {
  handled = provider.handlePretextChanged(this.suggestionId, pretext) || handled;
+
+ if (handled) {
+ break;
+ }
  }
 
  if (!handled) {

stores/suggestion_store.jsx

@@ -295,6 +295,7 @@ class SuggestionStore extends EventEmitter {
  this.setSuggestionsPending(id, false);
 
  if (this.isCompletePending(id)) {
+ this.setCompletePending(id, false);
  this.completeWord(id);
  } else {
  this.emitSuggestionsChanged(id);
@@ -315,7 +316,7 @@ class SuggestionStore extends EventEmitter {
  this.emitSuggestionsChanged(id);
  break;
  case ActionTypes.SUGGESTION_COMPLETE_WORD:
- if (this.areSuggestionsPending(id)) {
+ if (this.areSuggestionsPending(id) && !other.override) {
  this.setCompletePending(id, true);
  } else {
  this.completeWord(id, other.term, other.matchedPretext);