Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions resources/default-hxformat.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@
"\\.git",
"node_modules"
],
"fileExtensions": [
"hx"
],
"indentation": {
"character": "tab",
"conditionalPolicy": "aligned",
Expand Down
7 changes: 7 additions & 0 deletions resources/hxformat-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,13 @@
},
"type": "array"
},
"fileExtensions": {
"description": "Additional file extensions to format. * Example: hxp files from OpenFL",
"items": {
"type": "string"
},
"type": "array"
},
"sameLine": {
"$ref": "#/definitions/formatter.config.SameLineConfig"
},
Expand Down
7 changes: 5 additions & 2 deletions src/formatter/Cli.hx
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,11 @@ class Cli {
}

function formatFile(path:String) {
if (path.endsWith(extension)) {
var config = Formatter.loadConfig(path);
var config = Formatter.loadConfig(path);
var fileExtensions = config.fileExtensions;
fileExtensions.push(extension);

if (fileExtensions.exists(fileExtension -> path.endsWith(fileExtension))) {
if (verbose) {
verboseLogFile(path, config);
}
Expand Down
8 changes: 8 additions & 0 deletions src/formatter/config/Config.hx
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ class Config {
public var whitespace:WhitespaceConfig;
public var wrapping:WrapConfig;
public var disableFormatting:Bool;
public var fileExtensions:Array<String>;
public var excludes:Array<EReg>;
public var configFileName:String;

public function new() {
fileExtensions = [];
excludes = [];
readConfigFromString("{}", "hxformat.json");
}
Expand All @@ -41,8 +43,14 @@ class Config {
whitespace = data.whitespace;
wrapping = data.wrapping;
disableFormatting = data.disableFormatting;
fileExtensions = [];
excludes = [];
configFileName = fileName;

for (fileExtension in data.fileExtensions) {
fileExtensions.push(fileExtension);
}

for (exclude in data.excludes) {
excludes.push(new EReg(exclude, ""));
}
Expand Down
6 changes: 6 additions & 0 deletions src/formatter/config/FormatterConfig.hx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ typedef FormatterConfig = {
@:default(auto) @:optional var whitespace:WhitespaceConfig;
@:default(auto) @:optional var wrapping:WrapConfig;

/**
* Additional file extensions to format.
* Example: hxp files from OpenFL
*/
@:default(["hx"]) @:optional var fileExtensions:Array<String>;

/**
regular expressions matching files to exclude from formatting
default is to exclude any `.haxelib`, `.git` and `node_modules` folder
Expand Down
1 change: 1 addition & 0 deletions src/formatter/import.hx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import tokentree.utils.TokenTreeCheckUtils;
import formatter.codedata.ParsedCode;
import formatter.codedata.TokenInfo;

using Lambda;
using StringTools;
using tokentree.TokenTreeAccessHelper;
using formatter.config.WhitespacePolicy;
Expand Down