Skip to content
This repository has been archived by the owner on Mar 25, 2021. It is now read-only.

ordered-imports: don't remove linebreaks if text contains non-whitespace characters #4583

Merged
merged 2 commits into from
Mar 22, 2019
Merged
Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion src/rules/orderedImportsRule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,9 @@ class Walker extends Lint.AbstractWalker<Options> {
if (index > 0) {
const prevItems = groupedDeclarations[index - 1];
const last = prevItems[prevItems.length - 1];
if (/[\r\n]+/.test(this.sourceFile.text.slice(last.nodeEndOffset, start))) {

const textFragment = this.sourceFile.text.slice(last.nodeEndOffset, start);
if (!/\S/.test(textFragment)) {
// remove whitespace between blocks
start = last.nodeEndOffset;
}
Expand Down
2 changes: 2 additions & 0 deletions test/rules/ordered-imports/groups-complex/test.ts.fix
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import './baz'; // required

import {bar} from '../bar';
import {xbar} from '../xbar';
x.fnCall();



export class Test {}
1 change: 1 addition & 0 deletions test/rules/ordered-imports/groups-complex/test.ts.lint
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {foo, afoo} from 'foo';
~~~~~~~~~ [Named imports must be alphabetized.]

import x = require('y');
x.fnCall();

import './baz'; // required
import './baa';
Expand Down