Merge branch 'ns-no-duplicate-packages'

2018-01-08 08:53:07 -05:00
parent 626e0a16ef cf4d6c1165
commit 7af615ff6c
2 changed files with 19 additions and 15 deletions
@@ -37,7 +37,7 @@ define [
 			commandCompleter = new CommandManager(@metadataManager)

 			SnippetCompleter = new EnvironmentManager()
-			PackageCompleter = new PackageManager()
+			PackageCompleter = new PackageManager(@metadataManager)

 			Graphics = @graphics
 			Preamble = @preamble
@@ -20,22 +20,26 @@ define () ->
 		'framed', 'aliascnt', 'layaureo', 'authblk'
 	]

-	packageSnippets = for pkg in packages
-		{
-			caption: "\\usepackage{#{pkg}}"
-			snippet: "\\usepackage{#{pkg}}"
-			meta: "pkg"
-		}
-
-	packageSnippets.push {
-		caption: "\\usepackage{}"
-		snippet: "\\usepackage{$1}"
-		meta: "pkg"
-		score: 70
-	}
-
 	class PackageManager
+		constructor: (@metadataManager) ->
+
 		getCompletions: (editor, session, pos, prefix, callback) ->
+			usedPackages = Object.keys(@metadataManager.getAllPackages())
+			packageSnippets = []
+			for pkg in packages
+				if pkg not in usedPackages
+					packageSnippets.push {
+						caption: "\\usepackage{#{pkg}}"
+						snippet: "\\usepackage{#{pkg}}"
+						meta: "pkg"
+					}
+
+			packageSnippets.push {
+				caption: "\\usepackage{}"
+				snippet: "\\usepackage{$1}"
+				meta: "pkg"
+				score: 70
+			}
 			callback null, packageSnippets

 	return PackageManager