Allow separate tabSize and indentSize

Fixes editorconfig#346

src/api.ts

@@ -1,5 +1,12 @@
 import * as editorconfig from 'editorconfig'
-import { TextDocument, TextEditorOptions, Uri, window, workspace } from 'vscode'
+import {
+ TextDocument,
+ TextEditorOptions,
+ Uri,
+ window,
+ workspace,
+ commands,
+} from 'vscode'
 
 /**
  * Resolves `TextEditorOptions` for a `TextDocument`, combining the editor's
@@ -51,6 +58,7 @@ export async function applyTextEditorOptions(
  return
  }
 
+ commands.executeCommand('editor.action.detectIndentation')
  editor.options = newOptions
 
  if (onSuccess) {
@@ -74,6 +82,11 @@ export function pickWorkspaceDefaults(
  * this property value will be `undefined`.
  */
  insertSpaces?: boolean
+ /**
+ * The number of spaces used for indentation or `undefined` if
+ * `editor.detectIndentation` is on.
+ */
+ indentSize?: number | string
 } {
  const workspaceConfig = workspace.getConfiguration('editor', doc)
  const detectIndentation = workspaceConfig.get<boolean>('detectIndentation')
@@ -82,6 +95,7 @@ export function pickWorkspaceDefaults(
  ? {}
  : {
  tabSize: workspaceConfig.get<number>('tabSize'),
+ indentSize: workspaceConfig.get<number | string>('indentSize'),
  insertSpaces: workspaceConfig.get<boolean>('insertSpaces'),
  }
 }
@@ -150,26 +164,34 @@ export function fromEditorConfig(
 ): TextEditorOptions {
  const resolved: TextEditorOptions = {
  tabSize:
- config.indent_style === 'tab'
+ (config.indent_style === 'tab'
  ? config.tab_width ?? config.indent_size
- : config.indent_size ?? config.tab_width,
+ : config.tab_width) ?? defaults.tabSize,
+ indentSize:
+ (config.indent_style === 'tab'
+ ? config.indent_size ?? 'tabSize'
+ : config.indent_size) ?? defaults.indentSize,
  }
  if (resolved.tabSize === 'tab') {
  resolved.tabSize = config.tab_width
  }
- return {
- ...(config.indent_style === 'tab' ||
+ if (resolved.indentSize === 'tab') {
+ resolved.indentSize = 'tabSize'
+ }
+ if (
+ config.indent_style === 'tab' ||
  config.indent_size === 'tab' ||
  config.indent_style === 'space'
-  ? {
-  insertSpaces: config.indent_style === 'space',
-  }
-  : {}),
- tabSize:
-  resolved.tabSize && resolved.tabSize >= 0
-  ? resolved.tabSize
-  : defaults.tabSize,
+ ) {
+ resolved.insertSpaces = config.indent_style === 'space'
+ }
+ if (resolved.tabSize === undefined || resolved.tabSize === 'unset') {
+ delete resolved.tabSize
+ }
+ if (resolved.indentSize === undefined || resolved.indentSize === 'unset') {
+ delete resolved.indentSize
  }
+ return resolved
 }
 
 /**

src/test/suite/api.test.ts

@@ -19,6 +19,7 @@ suite('EditorConfig extension', () => {
  expected: {
  insertSpaces: false,
  tabSize: 5,
+ indentSize: 5,
  },
  },
  {
@@ -33,6 +34,7 @@ suite('EditorConfig extension', () => {
  expected: {
  insertSpaces: false,
  tabSize: 5,
+ indentSize: 'tabSize',
  },
  },
  {
@@ -46,7 +48,8 @@ suite('EditorConfig extension', () => {
  },
  expected: {
  insertSpaces: true,
- tabSize: 5,
+ tabSize: 4,
+ indentSize: 5,
  },
  },
  {
@@ -58,7 +61,8 @@ suite('EditorConfig extension', () => {
  tabSize: 4,
  },
  expected: {
- tabSize: 5,
+ tabSize: 4,
+ indentSize: 5,
  },
  },
  {
@@ -82,7 +86,8 @@ suite('EditorConfig extension', () => {
  tabSize: 4,
  },
  expected: {
- tabSize: 5,
+ tabSize: 4,
+ indentSize: 5,
  },
  },
  {
@@ -135,6 +140,7 @@ suite('EditorConfig extension', () => {
  expected: {
  insertSpaces: false,
  tabSize: 3,
+ indentSize: 'tabSize',
  },
  },
  {
@@ -166,7 +172,8 @@ suite('EditorConfig extension', () => {
  defaults: {},
  expected: {
  insertSpaces: true,
- tabSize: 2,
+ tabSize: 4,
+ indentSize: 2,
  },
  },
  ].forEach(scenario => {

src/test/suite/index.test.ts

@@ -215,12 +215,18 @@ suite('EditorConfig extension', function () {
  'tab_width',
  'indent-style-space',
  ])
- const expectedTabSize = 2
+ const expectedTabSize = 8
+ const expectedIndentSize = 2
  assert.strictEqual(
  options.tabSize,
  expectedTabSize,
  `editor has a tabSize of ${options.tabSize} instead of ${expectedTabSize}`,
  )
+ assert.strictEqual(
+ options.indentSize,
+ expectedIndentSize,
+ `editor has an indentSize of ${options.indentSize} instead of ${expectedIndentSize}`,
+ )
  assert.strictEqual(
  options.insertSpaces,
  true,
@@ -234,12 +240,18 @@ suite('EditorConfig extension', function () {
  'tab_width',
  'indent-style-tab',
  ])
- const expectedTabSize = 4
+ const expectedTabSize = 8
+ const expectedIndentSize = 4
  assert.strictEqual(
  options.tabSize,
  expectedTabSize,
  `editor has a tabSize of ${options.tabSize} instead of ${expectedTabSize}`,
  )
+ assert.strictEqual(
+ options.indentSize,
+ expectedIndentSize,
+ `editor has an indentSize of ${options.indentSize} instead of ${expectedIndentSize}`,
+ )
  assert.strictEqual(
  options.insertSpaces,
  false,