Commit fbceba1f1acc82d12e91bb9f4a33d8dd7ecf1a95
2021-05-01T14:34:07
ESLint: Re-enable no-cond-assign rule (#2870)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185
diff --git a/.eslintrc.js b/.eslintrc.js
index 5064bdb..ffa0b27 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -16,8 +16,6 @@ module.exports = {
// TODO: Think about re-enabling this rule
'no-prototype-builtins': 'off',
// TODO: Think about re-enabling this rule
- 'no-cond-assign': 'off',
- // TODO: Think about re-enabling this rule
'no-inner-declarations': 'off',
// TODO: Think about re-enabling this rule
'no-sparse-arrays': 'off',
diff --git a/components/prism-core.js b/components/prism-core.js
index 15c9678..f68943d 100644
--- a/components/prism-core.js
+++ b/components/prism-core.js
@@ -487,7 +487,7 @@ var _ = {
_.hooks.run('before-all-elements-highlight', env);
- for (var i = 0, element; element = env.elements[i++];) {
+ for (var i = 0, element; (element = env.elements[i++]);) {
_.highlightElement(element, async === true, env.callback);
}
},
@@ -711,7 +711,7 @@ var _ = {
return;
}
- for (var i=0, callback; callback = callbacks[i++];) {
+ for (var i=0, callback; (callback = callbacks[i++]);) {
callback(env);
}
}
diff --git a/docs/prism-core.js.html b/docs/prism-core.js.html
index cf7f233..4fe0ce3 100644
--- a/docs/prism-core.js.html
+++ b/docs/prism-core.js.html
@@ -540,7 +540,7 @@ var _ = {
_.hooks.run('before-all-elements-highlight', env);
- for (var i = 0, element; element = env.elements[i++];) {
+ for (var i = 0, element; (element = env.elements[i++]);) {
_.highlightElement(element, async === true, env.callback);
}
},
@@ -764,7 +764,7 @@ var _ = {
return;
}
- for (var i=0, callback; callback = callbacks[i++];) {
+ for (var i=0, callback; (callback = callbacks[i++]);) {
callback(env);
}
}
diff --git a/plugins/diff-highlight/prism-diff-highlight.js b/plugins/diff-highlight/prism-diff-highlight.js
index 3b912a0..c39d7d8 100644
--- a/plugins/diff-highlight/prism-diff-highlight.js
+++ b/plugins/diff-highlight/prism-diff-highlight.js
@@ -72,7 +72,7 @@
// add prefix
var lines = [], m;
HTML_LINE.lastIndex = 0;
- while (m = HTML_LINE.exec(highlighted)) {
+ while ((m = HTML_LINE.exec(highlighted))) {
lines.push(prefix + m[0]);
}
if (/(?:^|[\r\n]).$/.test(decoded)) {
diff --git a/plugins/file-highlight/prism-file-highlight.js b/plugins/file-highlight/prism-file-highlight.js
index 59e5924..443dd65 100644
--- a/plugins/file-highlight/prism-file-highlight.js
+++ b/plugins/file-highlight/prism-file-highlight.js
@@ -126,7 +126,7 @@
highlight: function highlight(container) {
var elements = (container || document).querySelectorAll(SELECTOR);
- for (var i = 0, element; element = elements[i++];) {
+ for (var i = 0, element; (element = elements[i++]);) {
Prism.highlightElement(element);
}
}
diff --git a/plugins/filter-highlight-all/prism-filter-highlight-all.js b/plugins/filter-highlight-all/prism-filter-highlight-all.js
index 0fa798b..03d61d8 100644
--- a/plugins/filter-highlight-all/prism-filter-highlight-all.js
+++ b/plugins/filter-highlight-all/prism-filter-highlight-all.js
@@ -94,10 +94,12 @@
if (script) {
var attr;
- if (attr = script.getAttribute('data-filter-selector')) {
+ attr = script.getAttribute('data-filter-selector');
+ if (attr) {
config.addSelector(attr);
}
- if (attr = script.getAttribute('data-reject-selector')) {
+ attr = script.getAttribute('data-reject-selector');
+ if (attr) {
config.reject.addSelector(attr);
}
}
diff --git a/plugins/jsonp-highlight/prism-jsonp-highlight.js b/plugins/jsonp-highlight/prism-jsonp-highlight.js
index ff35800..ba07b58 100644
--- a/plugins/jsonp-highlight/prism-jsonp-highlight.js
+++ b/plugins/jsonp-highlight/prism-jsonp-highlight.js
@@ -43,14 +43,14 @@
*/
function getAdapter(adapter) {
if (typeof adapter === 'function') {
- for (var i = 0, item; item = adapters[i++];) {
+ for (var i = 0, item; (item = adapters[i++]);) {
if (item.adapter.valueOf() === adapter.valueOf()) {
return item.adapter;
}
}
} else if (typeof adapter === 'string') {
// eslint-disable-next-line no-redeclare
- for (var i = 0, item; item = adapters[i++];) {
+ for (var i = 0, item; (item = adapters[i++]);) {
if (item.name === adapter) {
return item.adapter;
}
@@ -267,7 +267,7 @@
highlight: function (container) {
var elements = (container || document).querySelectorAll(SELECTOR);
- for (var i = 0, element; element = elements[i++];) {
+ for (var i = 0, element; (element = elements[i++]);) {
Prism.highlightElement(element);
}
}
diff --git a/plugins/previewers/prism-previewers.js b/plugins/previewers/prism-previewers.js
index 5efc8b5..17e3389 100644
--- a/plugins/previewers/prism-previewers.js
+++ b/plugins/previewers/prism-previewers.js
@@ -549,7 +549,7 @@
var previewers = token.getAttribute('data-previewers');
return (previewers || '').split(/\s+/).indexOf(this._type) === -1;
}
- } while(token = token.parentNode);
+ } while((token = token.parentNode));
return false;
};
@@ -565,7 +565,7 @@
if (token.classList && token.classList.contains(TOKEN_CLASS) && token.classList.contains(this._type)) {
break;
}
- } while(token = token.parentNode);
+ } while((token = token.parentNode));
if (token && token !== this._token) {
this._token = token;
diff --git a/prism.js b/prism.js
index 6c324eb..2574874 100644
--- a/prism.js
+++ b/prism.js
@@ -492,7 +492,7 @@ var _ = {
_.hooks.run('before-all-elements-highlight', env);
- for (var i = 0, element; element = env.elements[i++];) {
+ for (var i = 0, element; (element = env.elements[i++]);) {
_.highlightElement(element, async === true, env.callback);
}
},
@@ -716,7 +716,7 @@ var _ = {
return;
}
- for (var i=0, callback; callback = callbacks[i++];) {
+ for (var i=0, callback; (callback = callbacks[i++]);) {
callback(env);
}
}
@@ -1753,7 +1753,7 @@ Prism.languages.js = Prism.languages.javascript;
highlight: function highlight(container) {
var elements = (container || document).querySelectorAll(SELECTOR);
- for (var i = 0, element; element = elements[i++];) {
+ for (var i = 0, element; (element = elements[i++]);) {
Prism.highlightElement(element);
}
}