From 0ebda89efe4a3432252029ebc7a7308fb0436a1d Mon Sep 17 00:00:00 2001 From: Nate Stemen Date: Fri, 20 Oct 2017 11:54:03 +0100 Subject: [PATCH] fixing package manager issues --- .../auto-complete/AutoCompleteManager.coffee | 13 ++++++---- .../auto-complete/CommandManager.coffee | 26 +++++++++---------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee index 24a524b4b6..60241da990 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee @@ -1,10 +1,11 @@ define [ "ide/editor/directives/aceEditor/auto-complete/CommandManager" "ide/editor/directives/aceEditor/auto-complete/EnvironmentManager" + "ide/editor/directives/aceEditor/auto-complete/PackageManager" "ide/editor/directives/aceEditor/auto-complete/Helpers" "ace/ace" "ace/ext-language_tools" -], (CommandManager, EnvironmentManager, Helpers) -> +], (CommandManager, EnvironmentManager, PackageManager, Helpers) -> Range = ace.require("ace/range").Range aceSnippetManager = ace.require('ace/snippets').snippetManager @@ -35,6 +36,7 @@ define [ }) SnippetCompleter = new EnvironmentManager() + PackageCompleter = new PackageManager() Graphics = @graphics Preamble = @preamble @@ -126,10 +128,11 @@ define [ callback null, result @editor.completers = [ - @suggestionManager, - SnippetCompleter, - ReferencesCompleter, - LabelsCompleter, + @suggestionManager + SnippetCompleter + PackageCompleter + ReferencesCompleter + LabelsCompleter GraphicsCompleter ] diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/CommandManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/CommandManager.coffee index fd6cdf7e64..c63fbdbb09 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/CommandManager.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/CommandManager.coffee @@ -12,7 +12,7 @@ define [], () -> 'Lambda', 'Xi', 'Pi', 'Sigma', 'Upsilon', 'Phi', 'Psi', 'Omega' ] singleArgumentCommands = [ - 'chapter', 'usepackage', 'section', 'label', 'textbf', 'subsection', + 'chapter', 'section', 'label', 'textbf', 'subsection', 'vspace', 'cite', 'textit', 'documentclass', 'includegraphics', 'input', 'emph','caption', 'ref', 'title', 'author', 'texttt', 'include', 'hspace', 'bibitem', 'url', 'large', 'subsubsection', 'textsc', 'date', @@ -30,7 +30,7 @@ define [], () -> ] special = ['LaTeX', 'TeX'] - rawCommands = [].concat( + rawCommands = ['usepackage'].concat( noArgumentCommands, singleArgumentCommands, doubleArgumentCommands, @@ -63,19 +63,19 @@ define [], () -> meta: "cmd" } special = for cmd in special - { - caption: "\\#{cmd}{}" - snippet: "\\#{cmd}{}" - meta: "cmd" - } + { + caption: "\\#{cmd}{}" + snippet: "\\#{cmd}{}" + meta: "cmd" + } staticCommands = [].concat( - noArgumentCommands, - singleArgumentCommands, - doubleArgumentCommands, - tripleArgumentCommands, - special - ) + noArgumentCommands, + singleArgumentCommands, + doubleArgumentCommands, + tripleArgumentCommands, + special + ) class Parser constructor: (@doc, @prefix) ->