Merge branch 'sk-ac-disable-for-existing-environments' into sk-ac-improvements-integration

This commit is contained in:
Shane Kilkelly 2017-07-06 14:38:07 +01:00
commit 98f96d6087

View file

@ -12,6 +12,9 @@ define [
else else
return null return null
getCommandNameFromFragment = (commandFragment) ->
commandFragment?.match(/\\(\w+)\{/)?[1]
class AutoCompleteManager class AutoCompleteManager
constructor: (@$scope, @editor, @element, @labelsManager) -> constructor: (@$scope, @editor, @element, @labelsManager) ->
@suggestionManager = new SuggestionManager() @suggestionManager = new SuggestionManager()
@ -124,6 +127,9 @@ define [
if lineUpToCursor.match(/.*%.*/) if lineUpToCursor.match(/.*%.*/)
return return
commandFragment = getLastCommandFragment(lineUpToCursor) commandFragment = getLastCommandFragment(lineUpToCursor)
commandName = getCommandNameFromFragment(commandFragment)
if commandName in ['begin', 'end']
return
# Check that this change was made by us, not a collaborator # Check that this change was made by us, not a collaborator
# (Cursor is still one place behind) # (Cursor is still one place behind)
# NOTE: this is also the case when a user backspaces over a highlighted region # NOTE: this is also the case when a user backspaces over a highlighted region