Improved consistency of parameter ordering internally to type evaluat…

…or. No functional change.
jbradaric · Jun 18, 2023 · 53cb3f9 · 53cb3f9
1 parent 9bf8231
commit 53cb3f9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/packages/pyright-internal/src/analyzer/operations.ts b/packages/pyright-internal/src/analyzer/operations.ts
@@ -487,8 +487,8 @@ export function validateBinaryOperation(
 export function getTypeOfBinaryOperation(
     evaluator: TypeEvaluator,
     node: BinaryOperationNode,
-    inferenceContext: InferenceContext | undefined,
-    flags: EvaluatorFlags
+    flags: EvaluatorFlags,
+    inferenceContext: InferenceContext | undefined
 ): TypeResult {
     const leftExpression = node.leftExpression;
     let rightExpression = node.rightExpression;
@@ -505,7 +505,7 @@ export function getTypeOfBinaryOperation(
             operatorSupportsChaining(rightExpression.operator)
         ) {
             // Evaluate the right expression so it is type checked.
-            getTypeOfBinaryOperation(evaluator, rightExpression, inferenceContext, flags);
+            getTypeOfBinaryOperation(evaluator, rightExpression, flags, inferenceContext);
 
             // Use the left side of the right expression for comparison purposes.
             rightExpression = rightExpression.leftExpression;

diff --git a/packages/pyright-internal/src/analyzer/typeEvaluator.ts b/packages/pyright-internal/src/analyzer/typeEvaluator.ts
@@ -955,12 +955,12 @@ export function createTypeEvaluator(importLookup: ImportLookup, evaluatorOptions
             }
 
             case ParseNodeType.Call: {
-                typeResult = getTypeOfCall(node, inferenceContext, flags);
+                typeResult = getTypeOfCall(node, flags, inferenceContext);
                 break;
             }
 
             case ParseNodeType.Tuple: {
-                typeResult = getTypeOfTuple(node, inferenceContext, flags);
+                typeResult = getTypeOfTuple(node, flags, inferenceContext);
                 break;
             }
 
@@ -999,7 +999,7 @@ export function createTypeEvaluator(importLookup: ImportLookup, evaluatorOptions
             }
 
             case ParseNodeType.BinaryOperation: {
-                typeResult = getTypeOfBinaryOperation(evaluatorInterface, node, inferenceContext, flags);
+                typeResult = getTypeOfBinaryOperation(evaluatorInterface, node, flags, inferenceContext);
                 break;
             }
 
@@ -7372,8 +7372,8 @@ export function createTypeEvaluator(importLookup: ImportLookup, evaluatorOptions
 
     function getTypeOfTuple(
         node: TupleNode,
-        inferenceContext: InferenceContext | undefined,
-        flags: EvaluatorFlags
+        flags: EvaluatorFlags,
+        inferenceContext: InferenceContext | undefined
     ): TypeResult {
         if ((flags & EvaluatorFlags.ExpectingType) !== 0 && node.expressions.length === 0 && !inferenceContext) {
             return { type: makeTupleObject([]), isEmptyTupleShorthand: true };
@@ -7590,8 +7590,8 @@ export function createTypeEvaluator(importLookup: ImportLookup, evaluatorOptions
 
     function getTypeOfCall(
         node: CallNode,
-        inferenceContext: InferenceContext | undefined,
-        flags: EvaluatorFlags
+        flags: EvaluatorFlags,
+        inferenceContext: InferenceContext | undefined
     ): TypeResult {
         let baseTypeResult: TypeResult | undefined;