From 6e9b1c602be44071ad1636df876c0bd4ad91b3e4 Mon Sep 17 00:00:00 2001 From: Nate Stemen Date: Mon, 14 Aug 2017 18:02:51 +0100 Subject: [PATCH] fixing spaces vs. tabs issue --- .../auto-complete/AutoCompleteManager.coffee | 10 +- .../auto-complete/SnippetManager.coffee | 134 +++++++++--------- 2 files changed, 74 insertions(+), 70 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 5b02c6b6bb..e8893bf786 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 @@ -112,10 +112,12 @@ define [ else callback null, result - @editor.completers = [@suggestionManager, - SnippetCompleter, - ReferencesCompleter, - LabelsCompleter] + @editor.completers = [ + @suggestionManager, + SnippetCompleter, + ReferencesCompleter, + LabelsCompleter + ] disable: () -> @editor.setOptions({ diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/SnippetManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/SnippetManager.coffee index 7927a2cd6f..abc27badf9 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/SnippetManager.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/SnippetManager.coffee @@ -1,72 +1,74 @@ define () -> noArgumentCommands = [ - 'item', 'hline', 'lipsum', 'centering', 'noindent', 'textwidth', 'draw', - 'maketitle', 'newpage', 'verb', 'bibliography', 'fi', 'hfill', 'par', - 'in', 'sum', 'cdot', 'alpha', 'ldots', 'else', 'linewidth', 'left', - 'right', 'today', 'clearpage', 'newline', 'endinput', 'mu', - 'tableofcontents', 'vfill', 'bigskip', 'fill', 'cleardoublepage', - ] - singleArgumentCommands = [ - 'chapter', 'usepackage', 'section', 'label', 'textbf', 'subsection', - 'vspace', 'cite', 'textit', 'documentclass', 'includegraphics', 'input', - 'emph','caption', 'ref', 'title', 'author', 'texttt', 'include', - 'hspace', 'bibitem', 'url', 'large', 'subsubsection', 'textsc', 'date', - 'footnote', 'small', 'thanks', 'underline', 'graphicspath', 'pageref', - 'section*', 'subsection*', 'subsubsection*', 'sqrt', 'text', - 'normalsize', 'Large', 'paragraph', 'pagestyle', 'thispagestyle', - 'bibliographystyle', - ] - doubleArgumentCommands = [ - 'newcommand', 'frac', 'renewcommand', 'setlength', 'href', 'newtheorem', - ] - tripleArgumentCommands = [ - 'addcontentsline', 'newacronym', 'multicolumn' - ] - special = ['LaTeX', 'TeX'] + 'item', 'hline', 'lipsum', 'centering', 'noindent', 'textwidth', 'draw', + 'maketitle', 'newpage', 'verb', 'bibliography', 'fi', 'hfill', 'par', + 'in', 'sum', 'cdot', 'alpha', 'ldots', 'else', 'linewidth', 'left', + 'right', 'today', 'clearpage', 'newline', 'endinput', 'mu', + 'tableofcontents', 'vfill', 'bigskip', 'fill', 'cleardoublepage' + ] + singleArgumentCommands = [ + 'chapter', 'usepackage', 'section', 'label', 'textbf', 'subsection', + 'vspace', 'cite', 'textit', 'documentclass', 'includegraphics', 'input', + 'emph','caption', 'ref', 'title', 'author', 'texttt', 'include', + 'hspace', 'bibitem', 'url', 'large', 'subsubsection', 'textsc', 'date', + 'footnote', 'small', 'thanks', 'underline', 'graphicspath', 'pageref', + 'section*', 'subsection*', 'subsubsection*', 'sqrt', 'text', + 'normalsize', 'Large', 'paragraph', 'pagestyle', 'thispagestyle', + 'bibliographystyle' + ] + doubleArgumentCommands = [ + 'newcommand', 'frac', 'renewcommand', 'setlength', 'href', 'newtheorem' + ] + tripleArgumentCommands = [ + 'addcontentsline', 'newacronym', 'multicolumn' + ] + special = ['LaTeX', 'TeX'] - noArgumentCommands = for com in noArgumentCommands - { - caption: "\\#{com}" - snippet: "\\#{com}" - meta: "cmd" - } - singleArgumentCommands = for com in singleArgumentCommands - { - caption: "\\#{com}{}" - snippet: "\\#{com}{$1}" - meta: "cmd" - } - doubleArgumentCommands = for com in doubleArgumentCommands - { - caption: "\\#{com}{}{}" - snippet: "\\#{com}{$1}{$2}" - meta: "cmd" - } - tripleArgumentCommands = for com in tripleArgumentCommands - { - caption: "\\#{com}{}{}{}" - snippet: "\\#{com}{$1}{$2}{$3}" - meta: "cmd" - } - special = for cmd in special - if cmd == 'TeX' - { - caption: "\\TeX{}" - snippet: "\\TeX{}" - meta: "cmd" - } - else if com == 'LaTeX' - { - caption: "\\LaTeX{}" - snippet: "\\LaTeX{}" - meta: "cmd" - } + noArgumentCommands = for com in noArgumentCommands + { + caption: "\\#{com}" + snippet: "\\#{com}" + meta: "cmd" + } + singleArgumentCommands = for com in singleArgumentCommands + { + caption: "\\#{com}{}" + snippet: "\\#{com}{$1}" + meta: "cmd" + } + doubleArgumentCommands = for com in doubleArgumentCommands + { + caption: "\\#{com}{}{}" + snippet: "\\#{com}{$1}{$2}" + meta: "cmd" + } + tripleArgumentCommands = for com in tripleArgumentCommands + { + caption: "\\#{com}{}{}{}" + snippet: "\\#{com}{$1}{$2}{$3}" + meta: "cmd" + } + special = for cmd in special + if cmd == 'TeX' + { + caption: "\\TeX{}" + snippet: "\\TeX{}" + meta: "cmd" + } + else if com == 'LaTeX' + { + caption: "\\LaTeX{}" + snippet: "\\LaTeX{}" + meta: "cmd" + } - staticCommands = [].concat(noArgumentCommands, - singleArgumentCommands, - doubleArgumentCommands, - tripleArgumentCommands, - special) + staticCommands = [].concat( + noArgumentCommands, + singleArgumentCommands, + doubleArgumentCommands, + tripleArgumentCommands, + special + ) environments = [ "abstract", @@ -174,7 +176,7 @@ define () -> $3 \\end{thebibliography} """ - }] + }] staticSnippets = staticSnippets.concat staticCommands