From 3331d725e54863f50760ec0385ce92257161d66f Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 16 Jul 2018 17:52:11 -0700 Subject: [PATCH] Use toFileLocationRequestArgs --- .../src/features/formatting.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/extensions/typescript-language-features/src/features/formatting.ts b/extensions/typescript-language-features/src/features/formatting.ts index cd6113ef1bb..e82f4ef1c54 100644 --- a/extensions/typescript-language-features/src/features/formatting.ts +++ b/extensions/typescript-language-features/src/features/formatting.ts @@ -10,7 +10,6 @@ import { ConfigurationDependentRegistration } from '../utils/dependentRegistrati import * as typeConverters from '../utils/typeConverters'; import FileConfigurationManager from './fileConfigurationManager'; - class TypeScriptFormattingProvider implements vscode.DocumentRangeFormattingEditProvider, vscode.OnTypeFormattingEditProvider { public constructor( private readonly client: ITypeScriptServiceClient, @@ -56,17 +55,15 @@ class TypeScriptFormattingProvider implements vscode.DocumentRangeFormattingEdit options: vscode.FormattingOptions, token: vscode.CancellationToken ): Promise { - const filepath = this.client.toPath(document.uri); - if (!filepath) { + const file = this.client.toPath(document.uri); + if (!file) { return []; } await this.formattingOptionsManager.ensureConfigurationOptions(document, options, token); const args: Proto.FormatOnKeyRequestArgs = { - file: filepath, - line: position.line + 1, - offset: position.character + 1, + ...typeConverters.Position.toFileLocationRequestArgs(file, position), key: ch }; try {