From 4953db355ebdd5e78f7bde6488554e6e3bf76dca Mon Sep 17 00:00:00 2001
From: Defman21 <i@defman.me>
Date: Wed, 2 Aug 2017 23:46:49 +0300
Subject: [PATCH] Revert "Revert "Merge branch 'pr/rubocop' of
 https://github.com/Defman21/KomodoEdit into Defman21-pr/rubocop""

This reverts commit b0156ec8556d99585af076b94cadfa4d40ead6f4.
---
 .../content/pref/pref-syntax-checking.js      | 17 ++++++++
 .../content/pref/pref-syntax-checking.xul     | 40 +++++++++++++++++++
 src/chrome/komodo/locale/en-US/pref/pref.dtd  |  7 ++++
 src/lint/Conscript                            |  1 +
 4 files changed, 65 insertions(+)

diff --git a/src/chrome/komodo/content/pref/pref-syntax-checking.js b/src/chrome/komodo/content/pref/pref-syntax-checking.js
index 2a3f43b6e2..0780b19e1c 100644
--- a/src/chrome/komodo/content/pref/pref-syntax-checking.js
+++ b/src/chrome/komodo/content/pref/pref-syntax-checking.js
@@ -428,6 +428,23 @@ function javaScriptInfo(languageName) {
     };
 }
 
+languageInfo.Ruby = {
+    browseForRubocopBinary: () => {
+        let rubocop_binary = document.getElementById('rubocop_binary');
+        let currentPath = rubocop_binary.value;
+        let path = ko.filepicker.browseForExeFile(null, currentPath || "");
+        if (path)
+            rubocop_binary.value = path;
+    },
+    browseForRubocopConfig: () => {
+        let rubocop_config = document.getElementById('rubocop_config');
+        let currentPath = rubocop_config.value;
+        let path = ko.filepicker.browseForExeFile(null, currentPath || "");
+        if (path)
+            rubocop_config.value = path;
+    }
+};
+
 function typescript_setup() {
     if (!('TypeScript' in dialog)) {
         dialog.TypeScript = {};
diff --git a/src/chrome/komodo/content/pref/pref-syntax-checking.xul b/src/chrome/komodo/content/pref/pref-syntax-checking.xul
index 5aeb2b875e..8e413688a5 100644
--- a/src/chrome/komodo/content/pref/pref-syntax-checking.xul
+++ b/src/chrome/komodo/content/pref/pref-syntax-checking.xul
@@ -571,6 +571,46 @@
                         </menulist>
                     </hbox>
                 </groupbox>
+                <groupbox orient="vertical">
+                    <caption label="&rubocopChecking.label;"/>
+                    <description>
+                        &rubocopChecking.description;
+                    </description>
+                    <hbox align="center">
+                         <checkbox id="lint_rubocop_enabled"
+                            pref="true"
+                            preftype="boolean"
+                            label="&rubocopChecking.checkbox;" />
+                    </hbox>
+                    <hbox>
+                        <description>
+                            &rubocopChecking.binary;
+                        </description>
+                        <textbox id="rubocop_binary"
+                                 flex="1"
+                                 value=''
+                                 pref="true"
+                                 placeholder="&rubocopChecking.binaryPlaceholder;"
+                                 preftype="string"/>
+                        <button id='rubocop_linter_browse'
+                                label="&browse.label;"
+                                oncommand="languageInfo.Ruby.browseForRubocopBinary();"/>
+                    </hbox>
+                    <hbox>
+                        <description>
+                            &rubocopChecking.config;
+                        </description>
+                        <textbox id="rubocop_config"
+                                 flex="1"
+                                 value=''
+                                 pref="true"
+                                 placeholder="&rubocopChecking.configPlaceholder;"
+                                 preftype="string"/>
+                        <button id='eslint_config_browse'
+                                label="&browse.label;"
+                                oncommand="languageInfo.Ruby.browseForRubocopConfig();"/>
+                    </hbox>
+                </groupbox>
             </vbox>
         
             <vbox id="langSyntaxCheck-Sass">
diff --git a/src/chrome/komodo/locale/en-US/pref/pref.dtd b/src/chrome/komodo/locale/en-US/pref/pref.dtd
index 75b669f5de..e2f3ba00a4 100644
--- a/src/chrome/komodo/locale/en-US/pref/pref.dtd
+++ b/src/chrome/komodo/locale/en-US/pref/pref.dtd
@@ -844,6 +844,13 @@ adding an additional caret at the clicked position.">
 <!ENTITY rubyDebuggerNotWorking.description "The Ruby debugger extension does not work with the version of Ruby selected or that is on your path. You need to use Ruby version 1.8.2 or later.  You can get Ruby from the Ruby home page at">
 <!ENTITY filePrefRubyUseThisInterpreter.label "Use this interpreter">
 <!ENTITY filePrefRubyLevelStricness.description "You can configure the level of strictness that is used when doing background syntax checks.">
+<!ENTITY rubocopChecking.label "Rubocop Linter Checking">
+<!ENTITY rubocopChecking.checkbox "Enable the Rubocop linter">
+<!ENTITY rubocopChecking.description "Use the Rubocop linter when doing background syntax checking.">
+<!ENTITY rubocopChecking.binary "Rubocop binary:">
+<!ENTITY rubocopChecking.binaryPlaceholder "Find on path...">
+<!ENTITY rubocopChecking.config "Rubocop config:">
+<!ENTITY rubocopChecking.configPlaceholder "Find in current working directory...">
 <!ENTITY filePrefRubyAdditionalDirectory.description "Specify any additional directories that you want Komodo to add to the Ruby path when debugging, syntax checking or in the interactive shell.">
 <!ENTITY filePrefRubyExcludeDirectory.description "Specify any directories you want to exclude from code autocompletion scans.">
 
diff --git a/src/lint/Conscript b/src/lint/Conscript
index 226232da79..e38d9fa439 100644
--- a/src/lint/Conscript
+++ b/src/lint/Conscript
@@ -66,6 +66,7 @@ if ($havePy2to3) {
 $cons->InstallXpcomComponent('koCSSExLinter.py');
 $cons->InstallXpcomComponent('koHTMLLinter.py');
 $cons->InstallXpcomComponent('koPHPLinter.py');
+$cons->InstallXpcomComponent('koRubocopLinter.py');
 $cons->InstallXpcomComponent('koJavaScriptLinter.py');
 $cons->InstallXpcomComponent('koLintService.py');
 $cons->InstallPythonUtility('koLintResults.py');