don't complete default commands as argument #465

jcubic · Feb 7, 2019 · f60b224 · f60b224
1 parent 4ae2858
commit f60b224
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## 2.2.0
 ### Features
 * Handle unclosed entities [#462](https://github.com/jcubic/jquery.terminal/issues/462)
+### Bugfix
+* don't complete default commands as argument [#465](https://github.com/jcubic/jquery.terminal/issues/465)
 
 ## 2.1.2
 ### Bugfix

diff --git a/js/jquery.terminal-2.1.2.js b/js/jquery.terminal-2.1.2.js
@@ -35,7 +35,7 @@
  * emoji regex v7.0.1 by Mathias Bynens
  * MIT license
  *
- * Date: Sun, 03 Feb 2019 10:47:01 +0000
+ * Date: Thu, 07 Feb 2019 16:06:55 +0000
  */
 /* global location, jQuery, setTimeout, window, global, localStorage, sprintf,
          setImmediate, IntersectionObserver, MutationObserver, ResizeObserver,
@@ -813,6 +813,7 @@
                 var first = true;
                 if (window.ResizeObserver) {
                     resizer = new ResizeObserver(function() {
+                        console.log(arguments);
                         if (!first) {
                             resize_handler();
                         }
@@ -3459,7 +3460,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Sun, 03 Feb 2019 10:47:01 +0000',
+        date: 'Thu, 07 Feb 2019 16:06:55 +0000',
         // colors from http://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -6808,6 +6809,7 @@
                 var sensitive = options.caseSensitive;
                 // cursor can be in the middle of the command
                 // so we need to get the text before the cursor
+                var command = self.before_cursor(false);
                 var string = self.before_cursor(options.word).replace(/\\"/g, '"');
                 var quote = false;
                 if (options.word) {
@@ -6822,11 +6824,14 @@
                 }
                 // local copy
                 commands = commands.slice();
-                if (settings.clear && $.inArray('clear', commands) === -1) {
-                    commands.push('clear');
-                }
-                if (settings.exit && $.inArray('exit', commands) === -1) {
-                    commands.push('exit');
+                // default commands should not match for arguments
+                if (!command.match(/\s/)) {
+                    if (settings.clear && $.inArray('clear', commands) === -1) {
+                        commands.push('clear');
+                    }
+                    if (settings.exit && $.inArray('exit', commands) === -1) {
+                        commands.push('exit');
+                    }
                 }
                 if (tab_count % 2 === 0) {
                     command = self.before_cursor(options.word);

diff --git a/js/jquery.terminal-2.1.2.min.js b/js/jquery.terminal-2.1.2.min.js
diff --git a/js/jquery.terminal-src.js b/js/jquery.terminal-src.js
@@ -813,6 +813,7 @@
                 var first = true;
                 if (window.ResizeObserver) {
                     resizer = new ResizeObserver(function() {
+                        console.log(arguments);
                         if (!first) {
                             resize_handler();
                         }
@@ -6808,6 +6809,7 @@
                 var sensitive = options.caseSensitive;
                 // cursor can be in the middle of the command
                 // so we need to get the text before the cursor
+                var command = self.before_cursor(false);
                 var string = self.before_cursor(options.word).replace(/\\"/g, '"');
                 var quote = false;
                 if (options.word) {
@@ -6822,11 +6824,14 @@
                 }
                 // local copy
                 commands = commands.slice();
-                if (settings.clear && $.inArray('clear', commands) === -1) {
-                    commands.push('clear');
-                }
-                if (settings.exit && $.inArray('exit', commands) === -1) {
-                    commands.push('exit');
+                // default commands should not match for arguments
+                if (!command.match(/\s/)) {
+                    if (settings.clear && $.inArray('clear', commands) === -1) {
+                        commands.push('clear');
+                    }
+                    if (settings.exit && $.inArray('exit', commands) === -1) {
+                        commands.push('exit');
+                    }
                 }
                 if (tab_count % 2 === 0) {
                     command = self.before_cursor(options.word);

diff --git a/js/jquery.terminal.js b/js/jquery.terminal.js
@@ -35,7 +35,7 @@
  * emoji regex v7.0.1 by Mathias Bynens
  * MIT license
  *
- * Date: Sun, 03 Feb 2019 10:47:01 +0000
+ * Date: Thu, 07 Feb 2019 16:06:55 +0000
  */
 /* global location, jQuery, setTimeout, window, global, localStorage, sprintf,
          setImmediate, IntersectionObserver, MutationObserver, ResizeObserver,
@@ -813,6 +813,7 @@
                 var first = true;
                 if (window.ResizeObserver) {
                     resizer = new ResizeObserver(function() {
+                        console.log(arguments);
                         if (!first) {
                             resize_handler();
                         }
@@ -3459,7 +3460,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Sun, 03 Feb 2019 10:47:01 +0000',
+        date: 'Thu, 07 Feb 2019 16:06:55 +0000',
         // colors from http://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -6808,6 +6809,7 @@
                 var sensitive = options.caseSensitive;
                 // cursor can be in the middle of the command
                 // so we need to get the text before the cursor
+                var command = self.before_cursor(false);
                 var string = self.before_cursor(options.word).replace(/\\"/g, '"');
                 var quote = false;
                 if (options.word) {
@@ -6822,11 +6824,14 @@
                 }
                 // local copy
                 commands = commands.slice();
-                if (settings.clear && $.inArray('clear', commands) === -1) {
-                    commands.push('clear');
-                }
-                if (settings.exit && $.inArray('exit', commands) === -1) {
-                    commands.push('exit');
+                // default commands should not match for arguments
+                if (!command.match(/\s/)) {
+                    if (settings.clear && $.inArray('clear', commands) === -1) {
+                        commands.push('clear');
+                    }
+                    if (settings.exit && $.inArray('exit', commands) === -1) {
+                        commands.push('exit');
+                    }
                 }
                 if (tab_count % 2 === 0) {
                     command = self.before_cursor(options.word);

diff --git a/js/jquery.terminal.min.js b/js/jquery.terminal.min.js
diff --git a/js/jquery.terminal.min.js.map b/js/jquery.terminal.min.js.map