From 806a9671ef591138300ead3a62ecb68a025d2bd8 Mon Sep 17 00:00:00 2001 From: fofolee Date: Sun, 14 Jun 2020 10:31:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=8E=AF=E5=A2=83=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E5=91=BD=E4=BB=A4=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/plugins/codemirror/mode/shell/shell.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/assets/plugins/codemirror/mode/shell/shell.js b/src/assets/plugins/codemirror/mode/shell/shell.js index 5af1241..bc56f1e 100644 --- a/src/assets/plugins/codemirror/mode/shell/shell.js +++ b/src/assets/plugins/codemirror/mode/shell/shell.js @@ -23,12 +23,8 @@ CodeMirror.defineMode('shell', function() { var commonAtoms = ["true", "false"]; var commonKeywords = ["if", "then", "do", "else", "elif", "while", "until", "for", "in", "esac", "fi", "fin", "fil", "done", "exit", "set", "unset", "export", "function"]; - var commonCommands = ["ab", "awk", "bash", "beep", "cat", "cc", "cd", "chown", "chmod", "chroot", "clear", - "cp", "curl", "cut", "diff", "echo", "find", "gawk", "gcc", "get", "git", "grep", "hg", "kill", "killall", - "ln", "ls", "make", "mkdir", "openssl", "mv", "nc", "nl", "node", "npm", "ping", "ps", "restart", "rm", - "rmdir", "sed", "service", "sh", "shopt", "shred", "source", "sort", "sleep", "ssh", "start", "stop", - "su", "sudo", "svn", "tee", "telnet", "top", "touch", "vi", "vim", "wall", "wc", "wget", "who", "write", - "yes", "zsh"]; + var commonCommands = 'ab|awk|bash|beep|cat|cc|cd|chown|chmod|chroot|clear|cp|curl|cut|diff|echo|find|gawk|gcc|get|git|grep|hg|kill|killall|ln|ls|make|mkdir|openssl|mv|nc|nl|node|npm|ping|ps|restart|rm|rmdir|sed|service|sh|shopt|shred|source|sort|sleep|ssh|start|stop|su|sudo|svn|tee|telnet|top|touch|vi|vim|wall|wc|wget|who|write|yes|zsh'.split("|") + commonCommands = commonCommands.concat(getShellCommand()) CodeMirror.registerHelper("hintWords", "shell", commonAtoms.concat(commonKeywords, commonCommands)); @@ -70,7 +66,7 @@ CodeMirror.defineMode('shell', function() { stream.eatWhile(/\w/); return 'attribute'; } - if (/\d/.test(ch)) { + if (/^[0-9\.]/.test(ch)) { stream.eatWhile(/\d/); if(stream.eol() || !/\w/.test(stream.peek())) { return 'number';