Skip to content

Use ESLint to validate and fix indentation #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
edg2s wants to merge 3 commits into from
Closed

Use ESLint to validate and fix indentation #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7d4aba
Use ESLint to validate indentation (alt approach with fix)
edg2s Apr 17, 2020
3a68970
Allow empty string
edg2s Apr 24, 2020
c9712e2
Remove extra lines
edg2s Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions examples/samples/indent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"zero": 0,
"one": 1,
"two": 2,
"three": 3,
"four (correct)": 4,
"five": 5,
"tab": "t",
"parent (correct)": {
"zero": 0,
"one": 1,
"two": 2,
"three": 3,
"four (correct)": 4,
"five": 5
}
}
12 changes: 10 additions & 2 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ const errorSignature = err =>

const getErrorCode = _.pipe(_.get('ruleId'), _.split('/'), _.last);

let jsPrefix = '/* eslint-disable *//* eslint-enable indent */(';
const processors = {
'.json': {
preprocess: function(text, fileName) {
Expand All @@ -112,7 +113,7 @@ const processors = {
const parsed = jsonServiceHandle.parseJSONDocument(textDocument);
fileLintResults[fileName] = getDiagnostics(parsed);
fileComments[fileName] = parsed.comments;
return ['']; // sorry nothing ;)
return [jsPrefix + (text || '{}') + ')'];
},
postprocess: function(messages, fileName) {
const textDocument = fileDocuments[fileName];
Expand All @@ -138,6 +139,12 @@ const processors = {
start: {line: error.line - 1, character: error.column},
end: {line: error.endLine - 1, character: error.endColumn}
});
if (error.fix) {
error.fix.range = [
error.fix.range[0] - jsPrefix.length,
error.fix.range[1] - jsPrefix.length
];
}
return _.assign(error, {
source,
column: error.column + 1,
Expand All @@ -146,7 +153,8 @@ const processors = {
}),
_.values
)(messages);
}
},
supportsAutofix: true
}
};

Expand Down
3 changes: 2 additions & 1 deletion test/custom.eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"rules": {
"self/*": "warn",
"self/duplicate-key": "error",
"self/trailing-comma": "error"
"self/trailing-comma": "error",
"indent": ["error", 4]
},
"overrides": [
{
Expand Down
3 changes: 3 additions & 0 deletions test/integration.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ describe('Integrations tests', function() {
warnings: ['*']
});
});
it('indentation', function() {
validateFile('indent', {errorCount: 11, warningCount: 0});
});
});

describe('Integrations tests with config', function() {
Expand Down