[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master ffba418 26/66: Merge pull request #802 from wyuenho/update
From: |
Dmitry Gutov |
Subject: |
[elpa] master ffba418 26/66: Merge pull request #802 from wyuenho/update-keywords |
Date: |
Mon, 5 Nov 2018 18:19:16 -0500 (EST) |
branch: master
commit ffba418877368c0242070061ca86ae5575cff127
Merge: 779662f 270976b
Author: Dmitry Gutov <address@hidden>
Commit: GitHub <address@hidden>
Merge pull request #802 from wyuenho/update-keywords
Update Javascript and Python keywords
---
company-keywords.el | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/company-keywords.el b/company-keywords.el
index 92ff369..2ba12fe 100644
--- a/company-keywords.el
+++ b/company-keywords.el
@@ -149,9 +149,12 @@
"return" "short" "static" "strictfp" "super" "switch" "synchronized"
"this" "throw" "throws" "transient" "try" "void" "volatile" "while")
(javascript-mode
- "break" "catch" "const" "continue" "delete" "do" "else" "export" "for"
- "function" "if" "import" "in" "instanceOf" "label" "let" "new" "return"
- "switch" "this" "throw" "try" "typeof" "var" "void" "while" "with"
"yield")
+ ;; https://tc39.github.io/ecma262/ + async, static and undefined
+ "async" "await" "break" "case" "catch" "class" "const" "continue"
+ "debugger" "default" "delete" "do" "else" "enum" "export" "extends"
"false"
+ "finally" "for" "function" "if" "import" "in" "instanceof" "let" "new"
+ "null" "return" "static" "super" "switch" "this" "throw" "true" "try"
+ "typeof" "undefined" "var" "void" "while" "with" "yield")
(kotlin-mode
"abstract" "annotation" "as" "break" "by" "catch" "class" "companion"
"const" "constructor" "continue" "data" "do" "else" "enum" "false" "final"
@@ -209,9 +212,11 @@
"print" "private" "protected" "public" "require" "require_once" "return"
"static" "switch" "this" "throw" "try" "unset" "use" "var" "while" "xor")
(python-mode
- "and" "assert" "break" "class" "continue" "def" "del" "elif" "else"
- "except" "exec" "finally" "for" "from" "global" "if" "import" "in" "is"
- "lambda" "not" "or" "pass" "print" "raise" "return" "try" "while" "yield")
+ ;; https://docs.python.org/3/reference/lexical_analysis.html#keywords
+ "False" "None" "True" "and" "as" "assert" "break" "class" "continue" "def"
+ "del" "elif" "else" "except" "exec" "finally" "for" "from" "global" "if"
+ "import" "in" "is" "lambda" "nonlocal" "not" "or" "pass" "print" "raise"
+ "return" "try" "while" "with" "yield")
(ruby-mode
"BEGIN" "END" "alias" "and" "begin" "break" "case" "class" "def"
"defined?"
"do" "else" "elsif" "end" "ensure" "false" "for" "if" "in" "module"
@@ -267,6 +272,7 @@
(espresso-mode . javascript-mode)
(js-mode . javascript-mode)
(js-jsx-mode . javascript-mode)
+ (rjsx-mode . javascript-mode)
(cperl-mode . perl-mode)
(jde-mode . java-mode)
(ess-julia-mode . julia-mode)
- [elpa] master 045b23a 38/66: move golang's keywords to the right place, (continued)
- [elpa] master 045b23a 38/66: move golang's keywords to the right place, Dmitry Gutov, 2018/11/05
- [elpa] master 382764a 34/66: Merge pull request #798 from joaotavora/master, Dmitry Gutov, 2018/11/05
- [elpa] master 87f479b 59/66: Merge pull request #829 from chunzhouyu/master, Dmitry Gutov, 2018/11/05
- [elpa] master 7c6357a 60/66: Define variable alias before referent, Dmitry Gutov, 2018/11/05
- [elpa] master 88b8282 58/66: add nil and bool to company-keywords for go-mode, Dmitry Gutov, 2018/11/05
- [elpa] master 4fe0bec 57/66: Merge pull request #828 from chunzhouyu/master, Dmitry Gutov, 2018/11/05
- [elpa] master 4fa5a37 63/66: Backends are called at the same point where company begins, Dmitry Gutov, 2018/11/05
- [elpa] master ed8bf2a 56/66: capitalize the comment sentences, Dmitry Gutov, 2018/11/05
- [elpa] master c95a6b4 65/66: Release 0.9.7, Dmitry Gutov, 2018/11/05
- [elpa] master 1e22493 66/66: Merge commit 'c95a6b41d621de4253b77e512aa61fc0e75acddc' from company, Dmitry Gutov, 2018/11/05
- [elpa] master ffba418 26/66: Merge pull request #802 from wyuenho/update-keywords,
Dmitry Gutov <=
- [elpa] master 5ab7f42 64/66: Merge pull request #838 from bet4it/restore-point, Dmitry Gutov, 2018/11/05
- [elpa] master f31d284 33/66: Mention #798 in NEWS.md, Dmitry Gutov, 2018/11/05
- [elpa] master d0fab46 36/66: Properly fix #809, Dmitry Gutov, 2018/11/05
- [elpa] master 7e20ee4 43/66: update go-mode's keywords sort, Dmitry Gutov, 2018/11/05
- [elpa] master 2bcaa2e 55/66: add some refs, Dmitry Gutov, 2018/11/05
- [elpa] master afbaad1 62/66: company-ispell-available: Better error message, Dmitry Gutov, 2018/11/05
- [elpa] master 24bbc85 35/66: Fix #809 by looking up `face' as well, Dmitry Gutov, 2018/11/05
- [elpa] master 1f836b6 37/66: Merge pull request #810 from joaotavora/master, Dmitry Gutov, 2018/11/05
- [elpa] master 3162aa2 47/66: Update company-keywords.el, Dmitry Gutov, 2018/11/05
- [elpa] master b423ba4 48/66: Merge pull request #819 from chunzhouyu/master, Dmitry Gutov, 2018/11/05