refactors and bug fix

- Small refactor to jscompletions.py
- Fixes issue where some DI injections in function params would expand improperly

Author: subhaze

AngularJS-sublime-package.py

@@ -354,16 +354,7 @@ def on_query_completions(self, view, prefix, locations):
 			view.score_selector(_scope, ng.settings.get('js_scope'))
 			and not view.substr(locations[0] - 1) in ng.settings.get('js_prefixes')
 		):
-			word = None
-			if prefix == '':
-				word = view.substr(view.word(locations[0] - 2))
-				# Check if we're possibly at a directive attrs param
-				if 'attrs' in word.lower():
-					word = 'attrs'
-				# Check if we're possibly at a scope var
-				if 'scope' in word.lower():
-					word = '$rootScope'
-			return jscompletions.global_completions(word)
+			return jscompletions.global_completions(view, prefix, locations, ng.get_current_project_indexes())
 		if(view.score_selector(_scope, 'source.js string.quoted')):
 			if viewlocation.at_line_with_module(view, locations):
 				return jscompletions.get(('module'), ng.get_current_project_indexes())

jscompletions.py

@@ -1,18 +1,36 @@
-import sublime, itertools
+import sublime
+
+# Settings file names
+ANGULARJS_SUBLIME_PACKAGE = 'AngularJS-sublime-package.sublime-settings'
+ANGULARJS_JS_COMPLETIONS = 'AngularJS-js-completions.sublime-settings'
 
 
 def js_disabled():
-	package_settings = sublime.load_settings('AngularJS-sublime-package.sublime-settings')
+	package_settings = sublime.load_settings(ANGULARJS_SUBLIME_PACKAGE)
 	return package_settings.get('disable_default_js_completions', False)
 
 
-def global_completions(word=None):
-	js_completions = sublime.load_settings('AngularJS-js-completions.sublime-settings')
+def global_completions(view, prefix, locations, project_index):
 	if js_disabled():
 		return []
+
+	selector = 'meta.brace.round.js, meta.delimiter.object.comma.js'
+	if view.score_selector(locations[0]-2, selector):
+		return DI_completions(prefix, project_index)
+
+	js_completions = sublime.load_settings(ANGULARJS_JS_COMPLETIONS)
+	word = None
+	if prefix == '':
+		word = view.substr(view.word(locations[0] - 2))
+		# Check if we're possibly at a directive attrs param
+		if 'attrs' in word.lower():
+			word = 'attrs'
+		# Check if we're possibly at a scope var
+		if 'scope' in word.lower():
+			word = '$rootScope'
 	if word:
 		symbol = js_completions.get(word, [])
-		# in the settings we have strings, instead of a list of completions
+		# in the settings we can have strings, instead of a list, for completions
 		# since multiple symbols can have the same set of completions
 		# which we prefix with '_'
 		if len(symbol) and symbol[0] == '_':
@@ -23,31 +41,54 @@ def global_completions(word=None):
 
 
 def in_string_completions(prefix, project_index):
-	js_completions = sublime.load_settings('AngularJS-js-completions.sublime-settings')
 	if js_disabled():
 		return []
-	events = []
-	injectables_list = []
+	events = event_completions(prefix, project_index)
+	injectables = DI_completions(prefix, project_index)
+	return events + injectables
+
+
+def DI_completions(prefix, project_index):
+	js_completions = sublime.load_settings(ANGULARJS_JS_COMPLETIONS)
+	# TODO: Add option to turn off DI inject completions
+	if js_disabled():
+		return []
+	DIs = []
 	if prefix == '$':
-		events = list(js_completions.get('events', []))
-		events = [tuple(event) for event in events]
-		injectables = list(js_completions.get('js_completions', []))
+		DIs_list = list(js_completions.get('js_completions', []))
 		# filter out the js_completions list so that we only include
 		# items prefixed with '$' and use their simple form for the completion
 		# Also, suffix them with (DI) to signify that they're a Dependency Injection
-		for injectable in injectables:
-			if injectable[0][0] == '$':
-				injectables_list.append((injectable[0] + '(DI)', '\\'+injectable[0].split('\t')[0]))
-	custom_list = get(('constant', 'factory', 'service', 'value'), project_index)
-	return events + injectables_list + custom_list
+		for DI in DIs_list:
+			if DI[0].startswith('$'):
+				DIs.append((DI[0] + '(DI)', '\\'+DI[0].split('\t')[0]))
+	# Now look for any injectable items that have been indexed
+	injectables = ('constant', 'factory', 'service', 'value')
+	custom_DIs = get(injectables, project_index, '(DI)')
+	return DIs + custom_DIs
+
+
+def event_completions(prefix, project_index):
+	js_completions = sublime.load_settings(ANGULARJS_JS_COMPLETIONS)
+	# TODO: Add option to turn off event completions
+	if js_disabled():
+		return []
+	events = []
+	if prefix == '$':
+		events = list(js_completions.get('events', []))
+		events = [tuple(event) for event in events]
+	return events
 
 
-def get(type, project_index):
+def get(type, project_index, suffix=''):
 	all_defs = project_index.get('definitions')
 	types = []
 	for completion in all_defs:
 		if completion[0].startswith(type):
-			trigger = completion[0].split(':  ')[1].replace('.', '_') + '\tAngularJS'
-			result = completion[0].split(':  ')[1]
+			# Split based on 'Type: name'
+			trigger = completion[0].split(':  ')[1]
+			result = trigger
+			# Ensure we remove any '.' to prevent breaking ST completions
+			trigger = trigger.replace('.', '_') + '\tAngularJS' + suffix
 			types.append((trigger, result))
 	return list(set(types))