cleanup #142

sindresorhus · sindresorhus · commit c17358bbeade · 2016-10-11T15:05:42.000+07:00
diff --git a/options-manager.js b/options-manager.js
@@ -124,10 +124,6 @@ function buildConfig(opts) {
 		config.baseConfig.extends = ['xo/esnext', path.join(__dirname, 'config/plugins.js')];
 	}
 
-	if (opts.parser) {
-		config.baseConfig.parser = opts.parser;
-	}
-
 	if (opts.rules) {
 		Object.assign(config.rules, opts.rules);
 	}
@@ -136,6 +132,10 @@ function buildConfig(opts) {
 		config.baseConfig.settings = opts.settings;
 	}
 
+	if (opts.parser) {
+		config.baseConfig.parser = opts.parser;
+	}
+
 	if (opts.extends && opts.extends.length > 0) {
 		// TODO: this logic needs to be improved, preferably use the same code as ESLint
 		// user's configs must be resolved to their absolute paths
diff --git a/readme.md b/readme.md
@@ -180,12 +180,6 @@ Override any of the [default rules](https://github.com/sindresorhus/eslint-confi
 
 Please take a moment to consider if you really need to use this option.
 
-### settings
-
-Type: `object`
-
-Anything you put here gets passed to `settings` in the ESLint configuration; some of the ESLint plugins use this. For example, to configure the `import` ruleset to use the webpack configuration for determining search paths, you can put `{'import/resolver': 'webpack'}` here.
-
 ### semicolon
 
 Type: `boolean`<br>
@@ -211,11 +205,18 @@ Type: `Array`
 
 Allow more extensions to be linted besides `.js` and `.jsx`. Make sure they're supported by ESLint or an ESLint plugin.
 
+### settings
+
+Type: `Object`
+
+[Shared ESLint settings](http://eslint.org/docs/user-guide/configuring#adding-shared-settings) exposed to rules. For example, to configure the [`import`](https://github.com/benmosher/eslint-plugin-import#settings) plugin to use your webpack configuration for determining search paths, you can put `{"import/resolver": "webpack"}` here.
+
 ### parser
 
 Type: `string`
 
-Tell ESLint what parser to use, e.g. `"babel-eslint"` if you are using language features that ESLint doesn't support yet.
+ESLint parser. For example, [`babel-eslint`](https://github.com/babel/babel-eslint) if you're using language features that ESLint doesn't yet support.
+
 
 ## Config Overrides
 

Original file line number	Diff line number	Diff line change
`@@ -124,10 +124,6 @@ function buildConfig(opts) {`
`124`	`124`	`config.baseConfig.extends = ['xo/esnext', path.join(__dirname, 'config/plugins.js')];`
`125`	`125`	`}`
`126`	`126`
`127`		`- if (opts.parser) {`
`128`		`- config.baseConfig.parser = opts.parser;`
`129`		`- }`
`130`		`-`
`131`	`127`	`if (opts.rules) {`
`132`	`128`	`Object.assign(config.rules, opts.rules);`
`133`	`129`	`}`
`@@ -136,6 +132,10 @@ function buildConfig(opts) {`
`136`	`132`	`config.baseConfig.settings = opts.settings;`
`137`	`133`	`}`
`138`	`134`
	`135`	`+ if (opts.parser) {`
	`136`	`+ config.baseConfig.parser = opts.parser;`
	`137`	`+ }`
	`138`	`+`
`139`	`139`	`if (opts.extends && opts.extends.length > 0) {`
`140`	`140`	`// TODO: this logic needs to be improved, preferably use the same code as ESLint`
`141`	`141`	`// user's configs must be resolved to their absolute paths`