Skip to content
Merged
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
19 changes: 7 additions & 12 deletions src/test/suite/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as assert from 'assert'
import * as os from 'os'
import { Position, window, workspace, WorkspaceEdit, Uri } from 'vscode'
import { Position, window, workspace, WorkspaceEdit } from 'vscode'
import { getFixturePath, getOptionsForFixture, wait } from '../testUtils'

import * as utils from 'vscode-test-utils'
Expand Down Expand Up @@ -291,7 +291,7 @@ suite('EditorConfig extension', function () {
}).saveText('foobar')
assert(window.activeTextEditor, 'no active editor')

// Before saving, the selection is on line 0. This should remain unchanged.
// Before saving, the selection is on line 0. This should remain unchanged.
assert.strictEqual(
window.activeTextEditor.selection.start.line,
0,
Expand Down Expand Up @@ -336,18 +336,13 @@ function withSetting(
},
}
async function createDoc(contents = '', name = 'test') {
const fixturePath = getFixturePath([rule, value, name])

try {
await workspace.fs.delete(Uri.file(fixturePath))
} catch {
// ignore
}

const uri = await utils.createFile(contents, fixturePath)
const uri = await utils.createFile(
contents,
getFixturePath([rule, value, name]),
)
const doc = await workspace.openTextDocument(uri)
await window.showTextDocument(doc)
await wait(50) // wait for EditorConfig to apply new settings
await wait(100) // wait for EditorConfig to apply new settings
return doc
}
}