Add sort-imports (microsoft#287)

.eslintrc.js

@@ -32,5 +32,12 @@ module.exports = {
         "prettier/prettier": ["error"],
         "security/detect-non-literal-fs-filename": "off",
         "security/detect-object-injection": "off",
+        "sort-imports": [
+            "error",
+            {
+                allowSeparatedGroups: true,
+                ignoreCase: true,
+            },
+        ],
     },
 };

src/powerquery-parser/common/assert.ts

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { CommonError } from ".";
 import { ErrorResult, OkResult, Result, ResultUtils } from "./result";
+import { CommonError } from ".";
 
 export function asDefined<T>(maybeValue: T | undefined, maybeMessage?: string, maybeDetails?: object): NonNullable<T> {
     isDefined(maybeValue, maybeMessage, maybeDetails);

src/powerquery-parser/common/error.ts

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { Assert } from ".";
 import { Localization, LocalizationUtils, Templates } from "../localization";
+import { Assert } from ".";
 import { ICancellationToken } from "./cancellationToken/ICancellationToken";
 
 export type TInnerCommonError = CancellationError | InvariantError | UnknownError;

src/powerquery-parser/common/traversal.ts

@@ -2,8 +2,8 @@
 // Licensed under the MIT license.
 
 import { Assert, CommonError, Result } from ".";
-import { Ast } from "../language";
 import { NodeIdMap, NodeIdMapUtils, ParseContext, TXorNode, XorNodeKind, XorNodeUtils } from "../parser";
+import { Ast } from "../language";
 import { ResultUtils } from "./result";
 
 export type TriedTraverse<ResultType> = Result<ResultType, CommonError.CommonError>;

src/powerquery-parser/language/ast/astUtils/assert.ts

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 import * as TypeGuards from "./typeGuards";
-
 import { Ast } from "..";
 import { CommonError } from "../../../common";
 

src/powerquery-parser/language/ast/astUtils/astUtils.ts

@@ -1,5 +1,5 @@
-import { Ast } from "..";
 import { Assert, CommonError } from "../../../common";
+import { Ast } from "..";
 import { Constant } from "../../constant";
 import { TokenKind } from "../../token";
 

src/powerquery-parser/language/constant/constantUtils.ts

@@ -1,5 +1,5 @@
-import { Constant } from ".";
 import { Assert } from "../../common";
+import { Constant } from ".";
 import { TokenKind } from "../token";
 
 export function maybeUnaryOperatorKindFrom(maybeTokenKind: TokenKind | undefined): Constant.UnaryOperator | undefined {

src/powerquery-parser/language/type/typeUtils/assert.ts

@@ -2,9 +2,8 @@
 // Licensed under the MIT license.
 
 import * as isType from "./isType";
-
-import { Type } from "..";
 import { CommonError } from "../../../common";
+import { Type } from "..";
 
 export function assertAsAction(type: Type.TPowerQueryType): Type.Action {
     assertIsAction(type);

src/powerquery-parser/language/type/typeUtils/categorize.ts

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { Type } from "..";
 import { Assert, CommonError, ImmutableSet } from "../../../common";
 import {
     isEqualAnyUnion,
@@ -21,6 +20,7 @@ import {
     isEqualTextLiteral,
     isEqualType,
 } from "./isEqualType";
+import { Type } from "..";
 
 export type TCategory = TExtendedCategory | NonExtendedCategory;
 export type TExtendedCategory =

src/powerquery-parser/language/type/typeUtils/factories.ts

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { Type } from "..";
 import { Assert, CommonError, StringUtils } from "../../../common";
 import { PrimitiveTypeConstantMap, primitiveTypeMapKey } from "./primitive";
 import { simplify } from "./simplify";
+import { Type } from "..";
 
 export function createPrimitiveType<T extends Type.TypeKind>(isNullable: boolean, typeKind: T): Type.TPrimitiveType {
     const key: string = primitiveTypeMapKey(isNullable, typeKind);

src/powerquery-parser/language/type/typeUtils/isCompatible.ts

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { Type } from "..";
 import { Assert, CommonError, MapUtils } from "../../../common";
 import { isEqualFunctionSignature, isEqualType } from "./isEqualType";
 import { isFieldSpecificationList, isFunctionSignature } from "./isType";
+import { Type } from "..";
 
 // Returns `${left} is compatible with ${right}. Eg.
 // `Type.TextInstance is compatible with Type.AnyInstance` -> true

src/powerquery-parser/language/type/typeUtils/isEqualType.ts

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { Type } from "..";
 import { ArrayUtils, Assert, MapUtils } from "../../../common";
 import { isTypeInArray } from "./typeUtils";
+import { Type } from "..";
 
 export function isEqualType(left: Type.TPowerQueryType, right: Type.TPowerQueryType): boolean {
     if (left === right) {

src/powerquery-parser/language/type/typeUtils/isType.ts

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { Type } from "..";
 import { Assert } from "../../../common";
+import { Type } from "..";
 
 export function isAction(type: Type.TPowerQueryType): type is Type.Action {
     return type.kind === Type.TypeKind.Action;

src/powerquery-parser/language/type/typeUtils/nameOf.ts

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { Type } from "..";
-import { Constant } from "../..";
 import { Assert } from "../../../common";
+import { Constant } from "../..";
+import { Type } from "..";
 
 export function nameOf(type: Type.TPowerQueryType): string {
     if (type.kind === Type.TypeKind.Null) {

src/powerquery-parser/language/type/typeUtils/primitive.ts

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { Type } from "..";
 import { Assert } from "../../../common";
 import { Constant } from "../../constant";
+import { Type } from "..";
 
 export function maybePrimitiveTypeConstantKindFromTypeKind(
     typeKind: Type.TypeKind,

src/powerquery-parser/language/type/typeUtils/simplify.ts

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { Type } from "..";
-import { ArrayUtils, ImmutableSet } from "../../../common";
 import {
     AnyCategory,
     categorize,
@@ -16,7 +14,9 @@ import {
     TextCategory,
     TypeCategory,
 } from "./categorize";
+import { ArrayUtils, ImmutableSet } from "../../../common";
 import { isEqualType } from "./isEqualType";
+import { Type } from "..";
 
 export function simplify(types: ReadonlyArray<Type.TPowerQueryType>): ReadonlyArray<Type.TPowerQueryType> {
     const categorized: CategorizedPowerQueryTypes = categorize(types);

src/powerquery-parser/language/type/typeUtils/typeCheck.ts

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { Type } from "..";
-import { ArrayUtils } from "../../../common";
 import { isCompatible, isCompatibleWithFunctionParameter } from "./isCompatible";
+import { ArrayUtils } from "../../../common";
 import { isEqualFunctionParameter } from "./isEqualType";
+import { Type } from "..";
 
 export type TChecked =
     | CheckedDefinedFunction

src/powerquery-parser/language/type/typeUtils/typeUtils.ts

@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { Type } from "..";
 import { Ast, AstUtils } from "../..";
-import { Assert } from "../../../common";
 import { NodeIdMap, NodeIdMapUtils, ParseContext, XorNode, XorNodeKind } from "../../../parser";
+import { Assert } from "../../../common";
 import { createPrimitiveType } from "./factories";
 import { isCompatible } from "./isCompatible";
 import { isEqualType } from "./isEqualType";
+import { Type } from "..";
 import { typeKindFromPrimitiveTypeConstantKind } from "./primitive";
 
 export function typeKindFromLiteralKind(literalKind: Ast.LiteralKind): Type.TypeKind {

src/powerquery-parser/lexer/error.ts

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { Lexer } from "..";
 import { CommonError, StringUtils } from "../common";
 import { Localization, LocalizationUtils } from "../localization";
+import { Lexer } from "..";
 
 export type TLexError = CommonError.CommonError | LexError;
 

src/powerquery-parser/lexer/lexer.ts

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { LexError } from ".";
 import {
     ArrayUtils,
     Assert,
@@ -16,6 +15,7 @@ import {
     StringUtils,
 } from "../common";
 import { Keyword, Token } from "../language";
+import { LexError } from ".";
 import { LexSettings } from "../settings";
 
 // Call Lexer.stateFrom to instantiate a new State instance.

src/powerquery-parser/lexer/lexerSnapshot.ts

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { LexError } from ".";
-import { Lexer } from "..";
 import { Assert, CommonError, ICancellationToken, Result, ResultUtils, StringUtils } from "../common";
 import { Comment, Token } from "../language";
+import { Lexer } from "..";
+import { LexError } from ".";
 
 // The lexer is a multiline aware lexer.
 // That in part means multiline tokens are split up into <begin>, <content>, and <end> components.

src/powerquery-parser/localization/localization.ts

@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { Lexer } from "..";
 import { Assert, StringUtils } from "../common";
-import { Token } from "../language";
-import { LexError } from "../lexer";
-import { ParseError } from "../parser";
 import { SequenceKind, TokenWithColumnNumber } from "../parser/error";
 import { ILocalizationTemplates } from "./templates";
+import { Lexer } from "..";
+import { LexError } from "../lexer";
+import { ParseError } from "../parser";
+import { Token } from "../language";
 
 interface ILocalization {
     readonly error_common_cancellationError: (templates: ILocalizationTemplates) => string;

src/powerquery-parser/localization/templates.ts

@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { Locale } from "./locale";
 import * as bg_BG from "./templates/template.bg-BG.json";
 import * as ca_ES from "./templates/template.ca-ES.json";
 import * as cs_CZ from "./templates/template.cs-CZ.json";
 import * as da_DK from "./templates/template.da-DK.json";
 import * as de_DE from "./templates/template.de-DE.json";
 import * as el_GR from "./templates/template.el-GR.json";
+import * as en_US from "./templates/template.json";
 import * as es_ES from "./templates/template.es-ES.json";
 import * as et_EE from "./templates/template.et-EE.json";
 import * as eu_ES from "./templates/template.eu-ES.json";
@@ -20,7 +20,6 @@ import * as hu_HU from "./templates/template.hu-HU.json";
 import * as id_ID from "./templates/template.id-ID.json";
 import * as it_IT from "./templates/template.it-IT.json";
 import * as ja_JP from "./templates/template.ja-JP.json";
-import * as en_US from "./templates/template.json";
 import * as kk_KZ from "./templates/template.kk-KZ.json";
 import * as ko_KR from "./templates/template.ko-KR.json";
 import * as lt_LT from "./templates/template.lt-LT.json";
@@ -44,6 +43,7 @@ import * as uk_UA from "./templates/template.uk-UA.json";
 import * as vi_VN from "./templates/template.vi-VN.json";
 import * as zh_CN from "./templates/template.zh-CN.json";
 import * as zh_TW from "./templates/template.zh-TW.json";
+import { Locale } from "./locale";
 
 export {
     bg_BG,

src/powerquery-parser/parser/context/context.ts

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { NodeIdMap } from "..";
 import { Ast, Token } from "../../language";
+import { NodeIdMap } from "..";
 
 // Parsing use to be one giant evaluation, leading to an all-or-nothing outcome which was unsuitable for a
 // document that was being live edited.

src/powerquery-parser/parser/context/contextUtils.ts

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { NodeIdMap, ParseContext } from "..";
 import { ArrayUtils, Assert, CommonError, MapUtils, SetUtils, TypeScriptUtils } from "../../common";
 import { Ast, Token } from "../../language";
+import { NodeIdMap, ParseContext } from "..";
 import { NodeIdMapIterator, NodeIdMapUtils, TXorNode } from "../nodeIdMap";
 
 export function assertIsNodeKind<T extends Ast.TNode>(

src/powerquery-parser/parser/disambiguation/disambiguation.ts

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { ParseError } from "..";
-import { Result } from "../../common";
 import { Ast } from "../../language";
+import { ParseError } from "..";
 import { ParseState } from "../parseState";
+import { Result } from "../../common";
 
 export type TAmbiguousBracketNode = Ast.FieldProjection | Ast.FieldSelector | Ast.RecordExpression;
 

src/powerquery-parser/parser/disambiguation/disambiguationUtils.ts

@@ -1,13 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { ParseError } from "..";
-import { ArrayUtils, Assert, Result, ResultUtils, TypeScriptUtils } from "../../common";
-import { Trace, TraceConstant } from "../../common/trace";
-import { Ast, AstUtils, Constant, Token } from "../../language";
-import { NodeIdMapUtils } from "../nodeIdMap";
-import { Parser, ParseStateCheckpoint } from "../parser";
-import { ParseState, ParseStateUtils } from "../parseState";
 import {
     AmbiguousParse,
     BracketDisambiguation,
@@ -16,6 +9,13 @@ import {
     TAmbiguousBracketNode,
     TAmbiguousParenthesisNode,
 } from "./disambiguation";
+import { ArrayUtils, Assert, Result, ResultUtils, TypeScriptUtils } from "../../common";
+import { Ast, AstUtils, Constant, Token } from "../../language";
+import { Parser, ParseStateCheckpoint } from "../parser";
+import { ParseState, ParseStateUtils } from "../parseState";
+import { Trace, TraceConstant } from "../../common/trace";
+import { NodeIdMapUtils } from "../nodeIdMap";
+import { ParseError } from "..";
 
 // For each given parse function it'll create a deep copy of the state then parse with the function.
 // Mutates the given state to whatever parse state which matched the most amount of tokens.

src/powerquery-parser/parser/error.ts

@@ -2,9 +2,9 @@
 // Licensed under the MIT license.
 
 import { Assert, CommonError, StringUtils } from "../common";
-import { Token } from "../language";
 import { Localization, LocalizationUtils } from "../localization";
 import { ParseState } from "./parseState";
+import { Token } from "../language";
 
 export type TParseError = CommonError.CommonError | ParseError;
 

src/powerquery-parser/parser/nodeIdMap/ancestryUtils.ts

@@ -2,9 +2,9 @@
 // Licensed under the MIT license.
 
 import { NodeIdMap, NodeIdMapIterator, XorNodeUtils } from ".";
+import { TXorNode, XorNode } from "./xorNode";
 import { Assert } from "../../common";
 import { Ast } from "../../language";
-import { TXorNode, XorNode } from "./xorNode";
 
 export function assertGetAncestry(nodeIdMapCollection: NodeIdMap.Collection, rootId: number): ReadonlyArray<TXorNode> {
     const ancestryIds: number[] = [rootId];

src/powerquery-parser/parser/nodeIdMap/nodeIdMap.ts

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { ParseContext } from "..";
 import { Ast } from "../../language";
+import { ParseContext } from "..";
 
 export type AstNodeById = NumberMap<Ast.TNode>;
 export type ChildIdsById = NumberMap<ReadonlyArray<number>>;