Mirrors
/
atom-beautify
mirror of https://github.com/Glavin001/atom-beautify.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Closes #346. Merge options for language namespace, fallbacks, _default

This commit is contained in:
Glavin Wiechert 2015-05-19 15:02:23 -03:00
parent 5fd07cff9c
commit 573a949b6f
8 changed files with 72 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/nested-jsbeautifyrc/.jsbeautifyrc
View File

@ -3,7 +3,7 @@
brace_style: "collapse"
indent_char: " "
indent_scripts: "normal"
indent_size: 6
indent_size: 2
max_preserve_newlines: 1
preserve_newlines: true
unformatted:
@ -16,7 +16,8 @@
wrap_line_length: 0
css:
indent_char: " "
indent_size: 4
indent_size: 2
preserve_newlines: true
js:
indent_size: 2
indent_char: " "
@ -31,7 +32,7 @@
indent_level: 0
indent_with_tabs: false
python:
indent_size: 4
indent_size: 2
#max_line_length: 79
#ignore:
# - "E24"

0
examples/nested-jsbeautifyrc/less/original/test2.less → examples/nested-jsbeautifyrc/less/original/_test2.less
View File

0
examples/simple-jsbeautifyrc/coffeescript/original/operators.coffee → examples/simple-jsbeautifyrc/coffeescript/original/_operators.coffee
View File

0
examples/simple-jsbeautifyrc/coffeescript/original/test.coffee → examples/simple-jsbeautifyrc/coffeescript/original/_test.coffee
View File

4
spec/beautify-languages-spec.coffee
View File

@ -37,6 +37,8 @@ describe "BeautifyLanguages", ->
# Force activate package
pack = atom.packages.getLoadedPackage("atom-beautify")
pack.activateNow()
# Change logger level
# atom.config.set('atom-beautify._loggerLevel', 'verbose')
# Return promise
return activationPromise
@ -134,7 +136,7 @@ describe "BeautifyLanguages", ->
beautifyCompleted = false
completionFun = (text) ->
# console.log(expectedTestPath, text) if ext is ".swig"
# logger.verbose(expectedTestPath, text) if ext is ".less"
expect(text instanceof Error).not.toEqual(true, text)
# if text instanceof Error
# return beautifyCompleted = text # text == Error

86
src/beautifiers/index.coffee
View File

@ -290,7 +290,7 @@ module.exports = class Beautifiers
beautify : (text, allOptions, grammar, filePath, {onSave} = {}) ->
return new Promise((resolve, reject) =>
logger.info('beautify', text, allOptions, grammar, filePath)
console.log(allOptions)
logger.verbose(allOptions)
# Get language
fileExtension = path.extname(filePath)
@ -339,29 +339,21 @@ module.exports = class Beautifiers
return resolve( null )
# Options for Language
options = @getOptions(language.namespace, allOptions) or {}
console.log(options)
# Support fallback for options
if language.fallback?
for fallback in language.fallback
# Merge current options on top of fallback options
options = _.merge( @getOptions(fallback, allOptions) or {}, options)
options = @getOptions([language.namespace].concat(language.fallback or []), allOptions) or {}
# Get Beautifier
logger.verbose(grammar, language)
beautifiers = @getBeautifiers(language.name, options)
console.log(options)
# logger.verbose('beautifiers', beautifiers)
#
logger.verbose('options', options)
logger.verbose('beautifiers', beautifiers)
logger.verbose(language.name, filePath, options, allOptions)
# Check if unsupported language
if beautifiers.length < 1
unsupportedGrammar = true
else
# Select beautifier from language config preferences
beautifier = _.find(beautifiers, (beautifier) ->
beautifier.name is preferredBeautifierName
@ -420,7 +412,6 @@ module.exports = class Beautifiers
# Apply language-specific option transformations
options = transformOptions(beautifier, language.name, options)
# Beautify text with language options
beautifier.beautify(text, language.name, options)
.then(resolve)
@ -546,7 +537,7 @@ module.exports = class Beautifiers
envs = @getUserHome()
home = path.normalize(path.join(envs, config))
proj = @findFile(config, dir, upwards)
console.log(dir, proj, home)
logger.verbose(dir, proj, home)
return proj if proj
return home if @verifyExists(home)
null
@ -650,6 +641,7 @@ module.exports = class Beautifiers
editorconfig ?= require('editorconfig')
editorConfigOptions = editorconfig.parse(editedFilePath)
logger.verbose('editorConfigOptions', editorConfigOptions)
# Transform EditorConfig to Atom Beautify's config structure and naming
if editorConfigOptions.indent_style is 'space'
@ -675,11 +667,15 @@ module.exports = class Beautifiers
pf = path.join(p, "FAKEFILENAME")
pc = @getConfig(pf, false)
isNested = @isNestedOptions(pc)
unless isNested
pc = {
_default: pc
}
# Add config for p to project's config options
projectOptions.push(pc)
# logger.verbose p, pc
# Move upwards
p = path.resolve(p, "../")
@ -689,48 +685,72 @@ module.exports = class Beautifiers
# Combine all options together
allOptions = [
{
_default:
editorOptions
configOptions
},
configOptions,
{
_default:
homeOptions
},
editorConfigOptions
]
# Reverse and add projectOptions to all options
projectOptions.reverse()
allOptions = allOptions.concat(projectOptions)
# logger.verbose(allOptions)
return allOptions
getOptions : (selection, allOptions) ->
self = this
_ ?= require("lodash")
extend ?= require("extend")
# logger.verbose(selection, allOptions);
# Reduce all options into correctly merged options.
options = _.reduce(allOptions, (result, currOptions) ->
isNestedOptions : (currOptions) ->
containsNested = false
collectedConfig = {}
key = undefined
# Check if already nested under _default
if currOptions._default
return true
# Check to see if config file uses nested object format to split up js/css/html options
for key of currOptions
# Check if is supported language
if _.indexOf(self.languages.namespaces, key) >= 0 and typeof currOptions[key] is "object" # Check if nested object (more options in value)
if _.indexOf(@languages.namespaces, key) >= 0 and typeof currOptions[key] is "object" # Check if nested object (more options in value)
containsNested = true
break # Found, break out of loop, no need to continue
return containsNested
getOptions : (selections, allOptions) =>
self = this
_ ?= require("lodash")
extend ?= require("extend")
logger.verbose(selections, allOptions)
# logger.verbose(selection, allOptions);
# Reduce all options into correctly merged options.
options = _.reduce(allOptions, (result, currOptions) =>
collectedConfig = currOptions._default or {}
containsNested = @isNestedOptions(currOptions)
logger.verbose(containsNested, currOptions)
# logger.verbose(containsNested, currOptions);
# Create a flat object of config options if nested format was used
unless containsNested
_.merge collectedConfig, currOptions
else
# _.merge collectedConfig, currOptions
currOptions = {
_default: currOptions
}
# Merge with selected options
# where `selection` could be `html`, `js`, 'css', etc
# logger.verbose(selection, currOptions[selection]);
for selection in selections
# Merge current options on top of fallback options
logger.verbose('options', selection, currOptions[selection]);
_.merge collectedConfig, currOptions[selection]
logger.verbose('options', selection, collectedConfig);
extend result, collectedConfig
, {})

3
src/beautifiers/prettydiff.coffee
View File

@ -34,7 +34,7 @@ module.exports = class PrettyDiff extends Beautifier
beautify: (text, language, options) ->
return new @Promise((resolve, reject) ->
return new @Promise((resolve, reject) =>
prettydiff = require("prettydiff")
_ = require('lodash')
@ -71,6 +71,7 @@ module.exports = class PrettyDiff extends Beautifier
_.merge(options, args)
# Beautify
@verbose('prettydiff', options)
output = prettydiff.api(options)
result = output[0]

1
src/beautify.coffee
View File

@ -43,7 +43,6 @@ setCursors = (editor, posArray) ->
editor.addCursorAtBufferPosition bufferPosition
return
beautify = ({onSave}) ->
console.log('beautify!!!')
# Deprecation warning for beautify on save
if atom.config.get("atom-beautify.beautifyOnSave") is true
detail = """See issue https://github.com/Glavin001/atom-beautify/issues/308