Skip to content
This repository was archived by the owner on Aug 7, 2023. It is now read-only.

Commit fd1d7b5

Browse files
authored
Merge pull request #186 from AtomLinter/arcanemagus/update-eslint
Update ESLint to v5
2 parents 4a74a49 + 8ca6347 commit fd1d7b5

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

lib/index.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,13 @@ const getConfig = async (filePath) => {
3232
return null;
3333
};
3434

35-
const phpScopedEditor = editor => editor.getCursors().some(cursor =>
36-
cursor.getScopeDescriptor().getScopesArray().some(scope =>
37-
scope === phpEmbeddedScope));
35+
const phpScopedEditor = editor => (
36+
editor.getCursors().some(cursor => (
37+
cursor.getScopeDescriptor().getScopesArray().some(scope => (
38+
scope === phpEmbeddedScope
39+
))
40+
))
41+
);
3842

3943
const removePHP = str => str.replace(/<\?(?:php|=)?(?:[\s\S])+?\?>/gi, (match) => {
4044
const newlines = match.match(/\r?\n|\r/g);

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
"@commitlint/config-conventional": "^7.0.1",
6060
"@commitlint/travis-cli": "^7.0.0",
6161
"@semantic-release/apm-config": "^5.0.2",
62-
"eslint": "^4.6.0",
63-
"eslint-config-airbnb-base": "^12.0.0",
62+
"eslint": "^5.4.0",
63+
"eslint-config-airbnb-base": "^13.1.0",
6464
"eslint-plugin-import": "^2.7.0",
6565
"husky": "^0.14.3",
6666
"jasmine-fix": "^1.3.1",

spec/linter-htmlhint-spec.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
'use babel';
22

33
import * as path from 'path';
4-
// eslint-disable-next-line no-unused-vars
5-
import { it, fit, wait, beforeEach, afterEach } from 'jasmine-fix';
4+
5+
import {
6+
// eslint-disable-next-line no-unused-vars
7+
it, fit, wait, beforeEach, afterEach
8+
} from 'jasmine-fix';
69

710
const { lint } = require('../lib/index.js').provideLinter();
811

0 commit comments

Comments
 (0)