-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #23 from NewFuture/master
add prettier and prettyhtml for wxml formatter
- Loading branch information
Showing
5 changed files
with
268 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
|
|
||
| import { TextEdit, Range, TextDocument, DocumentRangeFormattingEditProvider, DocumentFormattingEditProvider, FormattingOptions, CancellationToken, window } from 'vscode' | ||
| import { Options, resolveConfig } from 'prettier' | ||
|
|
||
| function prettierify( | ||
| code: string, | ||
| options: Options, | ||
| ): string { | ||
| const prettier = require('prettier') | ||
| const prettierifiedCode = prettier.format(code, options) | ||
| return prettierifiedCode | ||
| } | ||
|
|
||
| function fullDocumentRange(document: TextDocument): Range { | ||
| const lastLineId = document.lineCount - 1 | ||
| return new Range(0, 0, lastLineId, document.lineAt(lastLineId).text.length) | ||
| } | ||
|
|
||
| class PrettierProvider | ||
| implements | ||
| DocumentRangeFormattingEditProvider, | ||
| DocumentFormattingEditProvider { | ||
| readonly options: { [index: string]: any } | ||
| constructor(options: { [index: string]: any }) { | ||
| this.options = options | ||
| } | ||
|
|
||
| provideDocumentRangeFormattingEdits( | ||
| document: TextDocument, | ||
| range: Range, | ||
| options: FormattingOptions, | ||
| token: CancellationToken | ||
| ): Promise<TextEdit[]> { | ||
| return this._provideEdits(document) | ||
| } | ||
|
|
||
| provideDocumentFormattingEdits( | ||
| document: TextDocument, | ||
| options: FormattingOptions, | ||
| token: CancellationToken | ||
| ): Promise<TextEdit[]> { | ||
| return this._provideEdits(document) | ||
| } | ||
|
|
||
| async _provideEdits(document: TextDocument): Promise<TextEdit[]> { | ||
| try { | ||
| const prettierOptions = await resolveConfig(document.uri.fsPath, { editorconfig: true }) | ||
| const prettierifiedCode = prettierify(document.getText(), Object.assign({}, this.options, prettierOptions)) | ||
| return [TextEdit.replace(fullDocumentRange(document), prettierifiedCode)] | ||
| } catch (error) { | ||
| console.log('Prettier format failed') | ||
| console.error(error.message) | ||
| window.showErrorMessage(error.message) | ||
| return [] | ||
| } | ||
| } | ||
| } | ||
|
|
||
| export default PrettierProvider |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /** | ||
| * modified from https://github.com/StarpTech/prettyhtml-vscode/blob/master/src/prettyhtmlEditProvider.ts | ||
| */ | ||
| import { | ||
| DocumentRangeFormattingEditProvider, | ||
| DocumentFormattingEditProvider, | ||
| Range, | ||
| TextDocument, | ||
| FormattingOptions, | ||
| CancellationToken, | ||
| TextEdit, | ||
| window | ||
| } from 'vscode' | ||
| import { resolveConfig } from 'prettier' | ||
|
|
||
| async function format( | ||
| text: string, | ||
| { uri }: TextDocument, | ||
| options: { [index: string]: any }, | ||
| prettyhtmlOptions: { [index: string]: any } | ||
| ): Promise<string> { | ||
| const prettyhtml = require('@starptech/prettyhtml') | ||
|
|
||
| const op = { | ||
| useTabs: prettyhtmlOptions.useTabs, | ||
| tabWidth: prettyhtmlOptions.tabWidth, | ||
| printWidth: prettyhtmlOptions.printWidth, | ||
| singleQuote: prettyhtmlOptions.singleQuote, | ||
| usePrettier: prettyhtmlOptions.usePrettier, | ||
| // prettier: prettierOptions, | ||
| wrapAttributes: prettyhtmlOptions.wrapAttributes, | ||
| sortAttributes: prettyhtmlOptions.sortAttributes | ||
| } | ||
|
|
||
| if (prettyhtmlOptions.usePrettier) { | ||
| const prettierOptions = await resolveConfig(uri.fsPath, { editorconfig: true }) | ||
| Object.assign(op, prettierOptions, { prettier: prettierOptions }) | ||
| } | ||
|
|
||
| return await prettyhtml(text, op).contents | ||
| } | ||
|
|
||
| function fullDocumentRange(document: TextDocument): Range { | ||
| const lastLineId = document.lineCount - 1 | ||
| return new Range(0, 0, lastLineId, document.lineAt(lastLineId).text.length) | ||
| } | ||
|
|
||
| class PrettyhtmlEditProvider | ||
| implements | ||
| DocumentRangeFormattingEditProvider, | ||
| DocumentFormattingEditProvider { | ||
| readonly prettyhtmlOptions: { [index: string]: any } | ||
| constructor(options: { [index: string]: any }) { | ||
| this.prettyhtmlOptions = options | ||
| } | ||
|
|
||
| provideDocumentRangeFormattingEdits( | ||
| document: TextDocument, | ||
| range: Range, | ||
| options: FormattingOptions, | ||
| token: CancellationToken | ||
| ): Promise<TextEdit[]> { | ||
| return this._provideEdits(document, { | ||
| rangeStart: document.offsetAt(range.start), | ||
| rangeEnd: document.offsetAt(range.end) | ||
| }) | ||
| } | ||
|
|
||
| provideDocumentFormattingEdits( | ||
| document: TextDocument, | ||
| options: FormattingOptions, | ||
| token: CancellationToken | ||
| ): Promise<TextEdit[]> { | ||
| return this._provideEdits(document, options) | ||
| } | ||
|
|
||
| private async _provideEdits(document: TextDocument, options: Object) { | ||
| if (this.prettyhtmlOptions.enable === false) { | ||
| console.info( | ||
| 'Prettyhtml is not enabled. Set \'prettyhtml.enable\' to true' | ||
| ) | ||
| return [] | ||
| } | ||
| try { | ||
| const code = await format( | ||
| document.getText(), | ||
| document, | ||
| options, | ||
| this.prettyhtmlOptions | ||
| ) | ||
| return [TextEdit.replace(fullDocumentRange(document), code)] | ||
| } catch (error) { | ||
| console.error('prettyhtml error \n', error.message) | ||
| window.showErrorMessage(error.message) | ||
| return [] | ||
| } | ||
| } | ||
| } | ||
|
|
||
| export default PrettyhtmlEditProvider |
Oops, something went wrong.