Skip to content

Commit

Permalink
fix: support self closing / void xml tags
Browse files Browse the repository at this point in the history
BREAKING CHANGES: foldingMarkers are now language specific
Check if any of your settings have been overridden in xml-like languages
  • Loading branch information
1nVitr0 committed Aug 5, 2022
1 parent 505c4b4 commit ab5ca38
Showing 1 changed file with 37 additions and 1 deletion.
38 changes: 37 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
"description": "Lines starting with these will not be taken into account when checking indentation. This is ised for C++-Style blocks ('{' in separate line) and for non-bracketed blocks (begin-end style). '{', 'end.*' and 'esac|fi' are already provided ('end.* is a bit more complicated, feel free to submit issued when some instances do not work)').",
"default": [],
"type": "array",
"scope": "language-overridable",
"items": {
"type": "string",
"format": "regex"
Expand All @@ -98,6 +99,7 @@
"description": "Lines ending with these will be handled as completed blocks (e.g. one line JSON objects). '}' and '</.*?>' are already provided (again '</.*?>' is a bit more complicated, feel free to submit issued when some instances do not work)",
"default": [],
"type": "array",
"scope": "language-overridable",
"items": {
"type": "string",
"format": "regex"
Expand All @@ -106,6 +108,7 @@
"blocksort.foldingMarkers": {
"description": "Folding markers used to detect folding. Blocks will only be completed if all folding is 0. '()', '[]', '{}' and '<>' are already provided",
"type": "object",
"scope": "language-overridable",
"default": {},
"additionalProperties": {
"type": "object",
Expand Down Expand Up @@ -162,6 +165,7 @@
"blocksort.sortConsecutiveBlockHeaders": {
"description": "sort consecutive block headers (such as case or when)",
"type": "boolean",
"scope": "language-overridable",
"default": true
},
"blocksort.enableCodeLens": {
Expand All @@ -171,7 +175,39 @@
}
}
}
]
],
"configurationDefaults": {
"[xml]": {
"blocksort.foldingMarkers": {
"<>": {
"start": "<[a-zA-Z0-9\\-_=\\s]+",
"end": "<\\/[a-zA-Z0-9\\-_=\\s]+|\\/>"
}
}
},
"[html]": {
"blocksort.foldingMarkers": {
"<>": {
"start": "<(?!(?:\\/|area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)(?:[\\s\\/]|>))[a-zA-Z0-9\\-_=\\s>]+",
"end": "<\\/[a-zA-Z0-9\\-_=\\s]+|\\/>"
}
}
},
"[php]": {
"blocksort.foldingMarkers": {
"<>": {
"start": "<(?!(?:\\/|area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)(?:[\\s\\/]|>))[a-zA-Z0-9\\-_=\\s>]+",
"end": "<\\/[a-zA-Z0-9\\-_=\\s]+|\\/>"
}
}
},
"[jsx-tags]": {
"<>": {
"start": "<(?!(?:\\/|area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)(?:[\\s\\/]|>))[a-zA-Z0-9\\-_=\\s>]+",
"end": "<\\/[a-zA-Z0-9\\-_=\\s]+|\\/>"
}
}
}
},
"scripts": {
"vscode:prepublish": "npm run package",
Expand Down

0 comments on commit ab5ca38

Please sign in to comment.