Merge branch 'master' of github.com:Glavin001/atom-beautify into feature/executables
This commit is contained in:
commit
beed2e37db
|
@ -1,4 +1,5 @@
|
||||||
# Next
|
# Next
|
||||||
|
- Fix [#1652](https://github.com/Glavin001/atom-beautify/issues/1652) and [#1653](https://github.com/Glavin001/atom-beautify/issues/1653). Add `.rb` to temp files passed in to the `rubocop` executable so they are not excluded.
|
||||||
- ...
|
- ...
|
||||||
|
|
||||||
# v0.29.26 (2017-05-28)
|
# v0.29.26 (2017-05-28)
|
||||||
|
|
|
@ -92,7 +92,7 @@ module.exports = class PHPCBF extends Beautifier
|
||||||
@run("phpcbf", [
|
@run("phpcbf", [
|
||||||
"--no-patch" unless options.phpcbf_version is 3
|
"--no-patch" unless options.phpcbf_version is 3
|
||||||
"--standard=#{options.standard}" if options.standard
|
"--standard=#{options.standard}" if options.standard
|
||||||
tempFile = @tempFile("temp", text)
|
tempFile = @tempFile("temp", text, ".php")
|
||||||
], {
|
], {
|
||||||
ignoreReturnCode: true
|
ignoreReturnCode: true
|
||||||
help: {
|
help: {
|
||||||
|
|
|
@ -51,7 +51,7 @@ module.exports = class Rubocop extends Beautifier
|
||||||
@run(rubocopPath, [
|
@run(rubocopPath, [
|
||||||
"--auto-correct"
|
"--auto-correct"
|
||||||
"--config", configFile
|
"--config", configFile
|
||||||
tempFile = @tempFile("temp", text)
|
tempFile = @tempFile("temp", text, '.rb')
|
||||||
], {ignoreReturnCode: true})
|
], {ignoreReturnCode: true})
|
||||||
.then(=>
|
.then(=>
|
||||||
@readFile(tempFile)
|
@readFile(tempFile)
|
||||||
|
@ -60,7 +60,7 @@ module.exports = class Rubocop extends Beautifier
|
||||||
@run("rubocop", [
|
@run("rubocop", [
|
||||||
"--auto-correct"
|
"--auto-correct"
|
||||||
"--config", configFile
|
"--config", configFile
|
||||||
tempFile = @tempFile("temp", text)
|
tempFile = @tempFile("temp", text, '.rb')
|
||||||
], {ignoreReturnCode: true})
|
], {ignoreReturnCode: true})
|
||||||
.then(=>
|
.then(=>
|
||||||
@readFile(tempFile)
|
@readFile(tempFile)
|
||||||
|
|
Loading…
Reference in New Issue