Skip to content

Commit 71074bb

Browse files
committed
Fix settings configuration for babylon6
1 parent b3893bd commit 71074bb

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

src/parsers/js/babylon6.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ const parserSettingsConfiguration = {
3434
key: 'plugins',
3535
title: 'Plugins',
3636
fields: defaultOptions.plugins,
37-
settings: settings => settings.plugins || [...defaultOptions.plugins],
37+
settings: settings => settings.plugins || defaultOptions.plugins,
38+
values: plugins => defaultOptions.plugins.reduce(
39+
(obj, name) => ((obj[name] = plugins.indexOf(name) > -1), obj),
40+
{}
41+
),
3842
},
3943
],
4044
};
@@ -53,7 +57,7 @@ export default {
5357
},
5458

5559
parse(babylon, code, options) {
56-
return babylon.parse(code, options);
60+
return babylon.parse(code, {...defaultOptions, ...options});
5761
},
5862

5963
getNodeName(node) {

src/parsers/utils/SettingsRenderer.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,9 @@ export default function SettingsRenderer(props) {
117117

118118
SettingsRenderer.propTypes = {
119119
settingsConfiguration: React.PropTypes.object.isRequired,
120-
parserSettings: React.PropTypes.object.isRequired,
120+
parserSettings: React.PropTypes.oneOfType([
121+
React.PropTypes.object,
122+
React.PropTypes.array,
123+
]).isRequired,
121124
onChange: React.PropTypes.func.isRequired,
122125
};

0 commit comments

Comments
 (0)