Left: | ||
Right: |
LEFT | RIGHT |
---|---|
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-2017 Eyeo GmbH | 3 * Copyright (C) 2006-2017 Eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 17 matching lines...) Expand all Loading... | |
28 "array-bracket-spacing": "error", | 28 "array-bracket-spacing": "error", |
29 "arrow-spacing": "error", | 29 "arrow-spacing": "error", |
30 "block-scoped-var": "error", | 30 "block-scoped-var": "error", |
31 "block-spacing": "error", | 31 "block-spacing": "error", |
32 "brace-style": ["error", "allman", {allowSingleLine: true}], | 32 "brace-style": ["error", "allman", {allowSingleLine: true}], |
33 "camelcase": ["error", {properties: "never"}], | 33 "camelcase": ["error", {properties: "never"}], |
34 "comma-dangle": "error", | 34 "comma-dangle": "error", |
35 "comma-spacing": "error", | 35 "comma-spacing": "error", |
36 "comma-style": "error", | 36 "comma-style": "error", |
37 "computed-property-spacing": "error", | 37 "computed-property-spacing": "error", |
38 "curly": ["error", "multi-or-nest", "consistent"], | 38 "curly": ["error", "multi-or-nest"], |
Felix Dahlke
2017/02/13 09:51:20
How I see it [0], this makes the following invalid
kzar
2017/02/13 10:07:50
I don't have any links to hand but IIRC both Thoma
Sebastian Noack
2017/02/13 11:31:29
Yeah, I remember as well, from past code reviews,
Felix Dahlke
2017/02/13 12:05:16
Yeah, that's the thing: If we deliberately decide
kzar
2017/02/13 13:02:21
Yea, good idea. I'm not trying to put words in any
Thomas Greiner
2017/02/13 13:06:13
I can only speak for myself but my objection was o
Felix Dahlke
2017/02/14 10:26:15
Quickly asked Wladimir about this: He feels the sa
| |
39 "eol-last": "error", | 39 "eol-last": "error", |
40 "func-call-spacing": "error", | 40 "func-call-spacing": "error", |
41 "indent": ["error", 2, {SwitchCase: 1, ArrayExpression: "first"}], | 41 "indent": ["error", 2, {SwitchCase: 1, ArrayExpression: "first"}], |
42 "key-spacing": "error", | 42 "key-spacing": "error", |
43 "keyword-spacing": "error", | 43 "keyword-spacing": "error", |
44 "linebreak-style": "error", | 44 "linebreak-style": "error", |
45 "lines-around-directive": "error", | 45 "lines-around-directive": "error", |
46 "max-len": ["error", 80, {ignoreUrls: true}], | 46 "max-len": ["error", 80, {ignoreUrls: true}], |
47 "new-parens": "error", | 47 "new-parens": "error", |
48 "no-array-constructor": "error", | 48 "no-array-constructor": "error", |
49 "no-caller": "error", | 49 "no-caller": "error", |
50 "no-case-declarations": "off", | 50 "no-case-declarations": "off", |
51 "no-catch-shadow": "error", | 51 "no-catch-shadow": "error", |
52 "no-cond-assign": "off", | 52 "no-cond-assign": "off", |
53 "no-console": ["error", {allow: ["warn", "error", "trace"]}], | 53 "no-console": ["error", {allow: ["warn", "error", "trace"]}], |
54 "no-control-regex": "off", | 54 "no-control-regex": "off", |
55 "no-else-return": "error", | 55 "no-else-return": "error", |
56 "no-empty": ["error", {allowEmptyCatch: true}], | |
56 "no-eval": "error", | 57 "no-eval": "error", |
57 "no-extra-bind": "error", | 58 "no-extra-bind": "error", |
58 "no-extra-label": "error", | 59 "no-extra-label": "error", |
59 "no-implied-eval": "error", | 60 "no-implied-eval": "error", |
60 "no-labels": ["error", {allowLoop: true}], | 61 "no-labels": ["error", {allowLoop: true}], |
61 "no-lone-blocks": "error", | 62 "no-lone-blocks": "error", |
62 "no-lonely-if": "error", | 63 "no-lonely-if": "error", |
63 "no-multi-spaces": "error", | 64 "no-multi-spaces": "error", |
64 "no-new-func": "error", | 65 "no-new-func": "error", |
65 "no-new-object": "error", | 66 "no-new-object": "error", |
66 "no-proto": "error", | 67 "no-proto": "error", |
67 "no-self-compare": "error", | 68 "no-self-compare": "error", |
68 "no-shadow": "error", | 69 "no-shadow": "error", |
kzar
2017/02/13 08:37:25
I think the no-shadow rule might be a mistake. It
Sebastian Noack
2017/02/13 11:31:29
In this particular case I think the code will be e
kzar
2017/02/13 13:02:22
Yea, you're probably right.
While the rule can be
Sebastian Noack
2017/02/13 14:20:28
Well, this is also an example, where shadowing mak
| |
69 "no-trailing-spaces": "error", | 70 "no-trailing-spaces": "error", |
70 "no-unneeded-ternary": "error", | 71 "no-unneeded-ternary": "error", |
71 "no-unused-vars": "off", | 72 "no-unused-vars": "off", |
72 "no-useless-computed-key": "error", | 73 "no-useless-computed-key": "error", |
73 "no-useless-concat": "error", | 74 "no-useless-concat": "error", |
74 "no-useless-escape": "error", | 75 "no-useless-escape": "error", |
75 "no-useless-return": "error", | 76 "no-useless-return": "error", |
76 "no-var": "error", | 77 "no-var": "error", |
77 "no-warning-comments": "error", | 78 "no-warning-comments": "error", |
78 "no-whitespace-before-property": "error", | 79 "no-whitespace-before-property": "error", |
(...skipping 25 matching lines...) Expand all Loading... | |
104 "strict": ["error", "global"], | 105 "strict": ["error", "global"], |
105 "valid-jsdoc": ["error", { | 106 "valid-jsdoc": ["error", { |
106 requireParamDescription: false, | 107 requireParamDescription: false, |
107 requireReturn: false, | 108 requireReturn: false, |
108 requireReturnDescription: false | 109 requireReturnDescription: false |
109 }], | 110 }], |
110 "yield-star-spacing": "error", | 111 "yield-star-spacing": "error", |
111 "yoda": "error" | 112 "yoda": "error" |
112 } | 113 } |
113 }; | 114 }; |
LEFT | RIGHT |