From 6c4a9835e3da71f0d49dbe1bbfde062b4d3ea8aa Mon Sep 17 00:00:00 2001 From: JordanBoltonMN Date: Wed, 8 Apr 2020 09:33:40 -0700 Subject: [PATCH] Consistent argument ordering (#126) * initial commit * updating positionUtils signatures * updated bad function call after reorder --- src/inspection/activeNode/activeNodeUtils.ts | 10 +++++----- src/inspection/autocomplete.ts | 4 ++-- src/inspection/position/positionUtils.ts | 20 +++++++++---------- src/task.ts | 10 +++++----- .../libraryTest/inspection/autocomplete.ts | 4 ++-- .../inspection/invokeExpression.ts | 2 +- src/test/libraryTest/inspection/scope.ts | 2 +- src/test/libraryTest/inspection/type.ts | 2 +- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/inspection/activeNode/activeNodeUtils.ts b/src/inspection/activeNode/activeNodeUtils.ts index d6cb2710..52d60628 100644 --- a/src/inspection/activeNode/activeNodeUtils.ts +++ b/src/inspection/activeNode/activeNodeUtils.ts @@ -31,11 +31,11 @@ import { ActiveNode } from "./activeNode"; // Sometimes we don't want to shift at all. // Nodes that prevent shifting are called anchor nodes. export function maybeActiveNode( - position: Position, nodeIdMapCollection: NodeIdMap.Collection, leafNodeIds: ReadonlyArray, + position: Position, ): ActiveNode | undefined { - const astSearch: AstNodeSearch = positionAstSearch(position, nodeIdMapCollection, leafNodeIds); + const astSearch: AstNodeSearch = positionAstSearch(nodeIdMapCollection, leafNodeIds, position); const maybeContextSearch: ParseContext.Node | undefined = positionContextSearch(astSearch, nodeIdMapCollection); let maybeLeaf: TXorNode | undefined; @@ -59,7 +59,7 @@ export function maybeActiveNode( return { position, ancestry: NodeIdMapIterator.expectAncestry(nodeIdMapCollection, leaf.node.id), - maybeIdentifierUnderPosition: maybeIdentifierUnderPosition(position, nodeIdMapCollection, leaf), + maybeIdentifierUnderPosition: maybeIdentifierUnderPosition(nodeIdMapCollection, leaf, position), }; } @@ -124,9 +124,9 @@ function isAnchorNode(position: Position, astNode: Ast.TNode): boolean { } function positionAstSearch( - position: Position, nodeIdMapCollection: NodeIdMap.Collection, leafNodeIds: ReadonlyArray, + position: Position, ): AstNodeSearch { const astNodeById: NodeIdMap.AstNodeById = nodeIdMapCollection.astNodeById; let maybeCurrentOnOrBefore: Ast.TNode | undefined; @@ -245,9 +245,9 @@ function positionContextSearch( } function maybeIdentifierUnderPosition( - position: Position, nodeIdMapCollection: NodeIdMap.Collection, leaf: TXorNode, + position: Position, ): Ast.Identifier | Ast.GeneralizedIdentifier | undefined { if (leaf.kind !== XorNodeKind.Ast) { return undefined; diff --git a/src/inspection/autocomplete.ts b/src/inspection/autocomplete.ts index 4f7fb465..da45fcff 100644 --- a/src/inspection/autocomplete.ts +++ b/src/inspection/autocomplete.ts @@ -24,8 +24,8 @@ export type TriedAutocomplete = Result; export function tryAutocomplete( settings: CommonSettings, - maybeActiveNode: ActiveNode | undefined, nodeIdMapCollection: NodeIdMap.Collection, + maybeActiveNode: ActiveNode | undefined, maybeParseError: ParseError.ParseError | undefined, ): TriedAutocomplete { if (maybeActiveNode === undefined) { @@ -39,7 +39,7 @@ export function tryAutocomplete( : undefined; let maybePositionName: string | undefined; - if (PositionUtils.isInXorNode(activeNode.position, nodeIdMapCollection, leaf, false, true)) { + if (PositionUtils.isInXorNode(nodeIdMapCollection, activeNode.position, leaf, false, true)) { if (activeNode.maybeIdentifierUnderPosition !== undefined) { maybePositionName = activeNode.maybeIdentifierUnderPosition.literal; } diff --git a/src/inspection/position/positionUtils.ts b/src/inspection/position/positionUtils.ts index 39ebc1d2..7d118f64 100644 --- a/src/inspection/position/positionUtils.ts +++ b/src/inspection/position/positionUtils.ts @@ -20,8 +20,8 @@ export function isBeforeXorNode(position: Position, xorNode: TXorNode, isBoundIn } export function isInXorNode( - position: Position, nodeIdMapCollection: NodeIdMap.Collection, + position: Position, xorNode: TXorNode, isLowerBoundIncluded: boolean, isUpperBoundIncluded: boolean, @@ -32,8 +32,8 @@ export function isInXorNode( case XorNodeKind.Context: return isInContextNode( - position, nodeIdMapCollection, + position, xorNode.node, isLowerBoundIncluded, isUpperBoundIncluded, @@ -58,16 +58,16 @@ export function isOnXorNodeStart(position: Position, xorNode: TXorNode): boolean } export function isOnXorNodeEnd( + nodeIdMapCollection: NodeIdMap.Collection, position: Position, xorNode: TXorNode, - nodeIdMapCollection: NodeIdMap.Collection, ): boolean { switch (xorNode.kind) { case XorNodeKind.Ast: return isOnAstNodeEnd(position, xorNode.node); case XorNodeKind.Context: - return isOnContextNodeEnd(position, xorNode.node, nodeIdMapCollection); + return isOnContextNodeEnd(nodeIdMapCollection, position, xorNode.node); default: throw isNever(xorNode); @@ -75,8 +75,8 @@ export function isOnXorNodeEnd( } export function isAfterXorNode( - position: Position, nodeIdMapCollection: NodeIdMap.Collection, + position: Position, xorNode: TXorNode, isBoundIncluded: boolean, ): boolean { @@ -85,7 +85,7 @@ export function isAfterXorNode( return isAfterAstNode(position, xorNode.node, isBoundIncluded); case XorNodeKind.Context: - return isAfterContextNode(position, nodeIdMapCollection, xorNode.node, isBoundIncluded); + return isAfterContextNode(nodeIdMapCollection, position, xorNode.node, isBoundIncluded); default: throw isNever(xorNode); @@ -107,15 +107,15 @@ export function isBeforeContextNode( } export function isInContextNode( - position: Position, nodeIdMapCollection: NodeIdMap.Collection, + position: Position, contextNode: ParseContext.Node, isLowerBoundIncluded: boolean, isHigherBoundIncluded: boolean, ): boolean { return ( !isBeforeContextNode(position, contextNode, isLowerBoundIncluded) && - !isAfterContextNode(position, nodeIdMapCollection, contextNode, isHigherBoundIncluded) + !isAfterContextNode(nodeIdMapCollection, position, contextNode, isHigherBoundIncluded) ); } @@ -126,9 +126,9 @@ export function isOnContextNodeStart(position: Position, contextNode: ParseConte } export function isOnContextNodeEnd( + nodeIdMapCollection: NodeIdMap.Collection, position: Position, contextNode: ParseContext.Node, - nodeIdMapCollection: NodeIdMap.Collection, ): boolean { const maybeLeaf: Ast.TNode | undefined = NodeIdMapUtils.maybeRightMostLeaf(nodeIdMapCollection, contextNode.id); if (maybeLeaf === undefined) { @@ -139,8 +139,8 @@ export function isOnContextNodeEnd( } export function isAfterContextNode( - position: Position, nodeIdMapCollection: NodeIdMap.Collection, + position: Position, contextNode: ParseContext.Node, isBoundIncluded: boolean, ): boolean { diff --git a/src/task.ts b/src/task.ts index 0c1c45e6..24cdbd13 100644 --- a/src/task.ts +++ b/src/task.ts @@ -56,8 +56,8 @@ export function tryInspection( triedParse: TriedParse, position: Inspection.Position, ): TriedInspection { - let leafNodeIds: ReadonlyArray; let nodeIdMapCollection: NodeIdMap.Collection; + let leafNodeIds: ReadonlyArray; let maybeParseError: ParseError.ParseError | undefined; if (ResultUtils.isErr(triedParse)) { @@ -72,18 +72,18 @@ export function tryInspection( } const context: ParseContext.State = triedParse.error.state.contextState; - leafNodeIds = context.leafNodeIds; nodeIdMapCollection = context.nodeIdMapCollection; + leafNodeIds = context.leafNodeIds; } else { const parseOk: ParseOk = triedParse.value; - leafNodeIds = parseOk.leafNodeIds; nodeIdMapCollection = parseOk.nodeIdMapCollection; + leafNodeIds = parseOk.leafNodeIds; } const maybeActiveNode: undefined | ActiveNode = ActiveNodeUtils.maybeActiveNode( - position, nodeIdMapCollection, leafNodeIds, + position, ); if (maybeActiveNode === undefined) { throw new CommonError.InvariantError(`${tryInspection.name}: couldn't create ActiveNode`); @@ -110,8 +110,8 @@ export function tryInspection( const triedAutocomplete: Inspection.TriedAutocomplete = Inspection.tryAutocomplete( settings, - activeNode, nodeIdMapCollection, + activeNode, maybeParseError, ); if (ResultUtils.isErr(triedAutocomplete)) { diff --git a/src/test/libraryTest/inspection/autocomplete.ts b/src/test/libraryTest/inspection/autocomplete.ts index ec33ace3..bfe65ab8 100644 --- a/src/test/libraryTest/inspection/autocomplete.ts +++ b/src/test/libraryTest/inspection/autocomplete.ts @@ -20,14 +20,14 @@ function expectAutocompleteOk( maybeParseError: ParseError.ParseError | undefined, ): ReadonlyArray { const maybeActiveNode: undefined | ActiveNode = ActiveNodeUtils.maybeActiveNode( - position, nodeIdMapCollection, leafNodeIds, + position, ); const triedInspect: TriedAutocomplete = Inspection.tryAutocomplete( settings, - maybeActiveNode, nodeIdMapCollection, + maybeActiveNode, maybeParseError, ); if (!ResultUtils.isOk(triedInspect)) { diff --git a/src/test/libraryTest/inspection/invokeExpression.ts b/src/test/libraryTest/inspection/invokeExpression.ts index fc4ea2ab..4860092e 100644 --- a/src/test/libraryTest/inspection/invokeExpression.ts +++ b/src/test/libraryTest/inspection/invokeExpression.ts @@ -18,9 +18,9 @@ function expectInvokeExpressionOk( position: Position, ): undefined | InspectedInvokeExpression { const maybeActiveNode: undefined | ActiveNode = ActiveNodeUtils.maybeActiveNode( - position, nodeIdMapCollection, leafNodeIds, + position, ); if (!(maybeActiveNode !== undefined)) { throw new Error(`AssertedFailed: maybeActiveNode !== undefined`); diff --git a/src/test/libraryTest/inspection/scope.ts b/src/test/libraryTest/inspection/scope.ts index b5567dd0..847763ca 100644 --- a/src/test/libraryTest/inspection/scope.ts +++ b/src/test/libraryTest/inspection/scope.ts @@ -129,9 +129,9 @@ function expectScopeForNodeOk( position: Position, ): ScopeItemByKey { const maybeActiveNode: undefined | ActiveNode = ActiveNodeUtils.maybeActiveNode( - position, nodeIdMapCollection, leafNodeIds, + position, ); if (maybeActiveNode === undefined) { return new Map(); diff --git a/src/test/libraryTest/inspection/type.ts b/src/test/libraryTest/inspection/type.ts index 36fa9b7a..b5b29c00 100644 --- a/src/test/libraryTest/inspection/type.ts +++ b/src/test/libraryTest/inspection/type.ts @@ -27,9 +27,9 @@ function expectScopeTypeOk( position: Position, ): ScopeTypeMap { const maybeActiveNode: undefined | ActiveNode = ActiveNodeUtils.maybeActiveNode( - position, nodeIdMapCollection, leafNodeIds, + position, ); if (!(maybeActiveNode !== undefined)) { throw new Error(`AssertedFailed: maybeActiveNode !== undefined`);