Replace the djlint.indent option with djlint.useEditorIndentation, which is more flexible and more consistent with the VS Code API

Author: monosans

README.md

@@ -21,7 +21,7 @@ If you have the [Python extension](https://marketplace.visualstudio.com/items?it
 | jinja          | jinja, [jinja-html](https://marketplace.visualstudio.com/items?itemName=samuelcolvin.jinjahtml) |
 | nunjucks       | nj, njk, nunjucks, twig                                                                         |
 
-Some djLint options, such as `indent` and `ignore`, can be configured directly in the VS Code settings. Other djLint options can be set through the configuration file, as indicated in the [corresponding documentation](https://djlint.com/docs/configuration/). Please do not change the `linter_output_format` setting, otherwise linter will work incorrectly.
+djLint's `indent` and `ignore` options can be configured directly in the VS Code settings. Other djLint options can be set through the configuration file, as indicated in the [corresponding documentation](https://djlint.com/docs/configuration/). Please do not change the `linter_output_format` setting, otherwise linter will work incorrectly.
 
 Add this to your `settings.json` to format all supported file types with `djLint`:
 

package.json

@@ -50,16 +50,16 @@
           },
           "description": "Codes to ignore."
         },
-        "djlint.indent": {
-          "type": "number",
-          "default": null,
-          "description": "Indent spacing."
-        },
         "djlint.pythonPath": {
           "type": "string",
           "default": "python",
           "description": "Path to desired Python interpreter. Works only if djlint.useVenv is disabled or Python extension is not installed."
         },
+        "djlint.useEditorIndentation": {
+          "type": "boolean",
+          "default": true,
+          "description": "Get number of indent spaces from VS Code (see editor.tabSize setting). Disable to get it from the djLint config file."
+        },
         "djlint.useVenv": {
           "type": "boolean",
           "default": true,

src/extension.ts

@@ -38,7 +38,7 @@ async function getPythonExec(
   config: vscode.WorkspaceConfiguration,
   document: vscode.TextDocument
 ): Promise<[string, string[]]> {
-  if (config.get<boolean>("useVenv")) {
+  if (config.get<boolean>("useVenv") === true) {
     const pythonExtension = vscode.extensions.getExtension("ms-python.python");
     if (pythonExtension) {
       const api = (
@@ -182,7 +182,8 @@ export function activate(context: vscode.ExtensionContext): void {
   // Formatting
   vscode.languages.registerDocumentFormattingEditProvider(supportedLanguages, {
     async provideDocumentFormattingEdits(
-      document: vscode.TextDocument
+      document: vscode.TextDocument,
+      options: vscode.FormattingOptions
     ): Promise<vscode.TextEdit[]> {
       const config = getConfig();
       let pythonPath;
@@ -191,10 +192,9 @@ export function activate(context: vscode.ExtensionContext): void {
       } catch (error) {
         return [];
       }
-      const indent = config.get<number | null>("indent");
       const args = ["--reformat"];
-      if (indent !== undefined && indent !== null) {
-        args.push("--indent", indent.toString());
+      if (config.get<boolean>("useEditorIndentation") === true) {
+        args.push("--indent", options.tabSize.toString());
       }
       let stdout;
       try {