Stop digging into expressions when result is set.

Author: cristianoc

analysis/src/Completion.ml

@@ -476,7 +476,7 @@ let completionWithParser ~debug ~path ~posCursor ~currentFile ~text =
          so the apply expression does not include the cursor *)
       if setPipeResult ~lhs ~id:"" then setFound ()
     | _ ->
-      if expr.pexp_loc |> Loc.hasPos ~pos:posNoWhite then (
+      if expr.pexp_loc |> Loc.hasPos ~pos:posNoWhite && !result = None then (
         setFound ();
         match expr.pexp_desc with
         | Pexp_constant _ -> setResult Cnone

analysis/tests/src/expected/Completion.res.txt

@@ -378,8 +378,6 @@ Completable: Clabel([Lib, foo], "", [])
 
 Complete tests/src/Completion.res 26:13
 posCursor:[26:13] posNoWhite:[26:12] Found expr:[26:3->26:13]
-posCursor:[26:13] posNoWhite:[26:12] Found expr:[26:12->26:13]
-Pexp_ident m:[26:12->26:13]
 Completable: Cpath array->m
 [{
     "label": "Js.Array2.mapi",
@@ -397,8 +395,6 @@ Completable: Cpath array->m
 
 Complete tests/src/Completion.res 29:13
 posCursor:[29:13] posNoWhite:[29:12] Found expr:[29:3->29:13]
-posCursor:[29:13] posNoWhite:[29:12] Found expr:[29:10->29:13]
-Pexp_ident toU:[29:10->29:13]
 Completable: Cpath string->toU
 [{
     "label": "Js.String2.toUpperCase",
@@ -410,8 +406,6 @@ Completable: Cpath string->toU
 
 Complete tests/src/Completion.res 34:8
 posCursor:[34:8] posNoWhite:[34:7] Found expr:[34:3->34:8]
-posCursor:[34:8] posNoWhite:[34:7] Found expr:[34:7->34:8]
-Pexp_ident e:[34:7->34:8]
 Completable: Cpath Value[op]->e
 [{
     "label": "Belt.Option.eqU",
@@ -431,8 +425,6 @@ Complete tests/src/Completion.res 44:7
 posCursor:[44:7] posNoWhite:[44:6] Found expr:[44:3->54:3]
 Pexp_apply ...[50:9->50:10] (...[44:3->50:8], ...[51:2->54:3])
 posCursor:[44:7] posNoWhite:[44:6] Found expr:[44:3->50:8]
-posCursor:[44:7] posNoWhite:[44:6] Found expr:[44:5->44:7]
-Pexp_ident |.:[44:5->44:7]
 Completable: Cpath Value[fa]->
 [{
     "label": "ForAuto.abc",
@@ -484,8 +476,6 @@ Completable: Cpath Value[z]
 Complete tests/src/Completion.res 62:23
 posCursor:[62:23] posNoWhite:[62:22] Found expr:[62:15->62:23]
 JSX <O.Comp:[62:15->62:21] z[62:22->62:23]=...[62:22->62:23]> _children:None
-posCursor:[62:23] posNoWhite:[62:22] Found expr:[62:22->62:23]
-Pexp_ident z:[62:22->62:23]
 Completable: Cjsx([O, Comp], z, [z])
 [{
     "label": "zoo",
@@ -692,8 +682,6 @@ Completable: Cpath Value[Obj, object][""]
 Complete tests/src/Completion.res 151:6
 posCursor:[151:6] posNoWhite:[151:5] Found expr:[151:4->151:6]
 JSX <O.:[151:4->151:6] > _children:None
-posCursor:[151:6] posNoWhite:[151:5] Found expr:[151:4->151:6]
-Pexp_ident O..createElement:[151:4->151:6]
 Completable: Cpath Module[O, ""]
 [{
     "label": "Comp",
@@ -754,8 +742,6 @@ Completable: Cpath Value[Lis]
 Complete tests/src/Completion.res 169:16
 posCursor:[169:16] posNoWhite:[169:15] Found expr:[169:4->169:16]
 JSX <WithChildren:[169:4->169:16] > _children:None
-posCursor:[169:16] posNoWhite:[169:15] Found expr:[169:4->169:16]
-Pexp_ident WithChildren.createElement:[169:4->169:16]
 Completable: Cpath Module[WithChildren]
 [{
     "label": "WithChildren",

analysis/tests/src/expected/Div.res.txt

@@ -4,8 +4,6 @@ Hover tests/src/Div.res 0:10
 Complete tests/src/Div.res 3:17
 posCursor:[3:17] posNoWhite:[3:16] Found expr:[3:4->3:17]
 JSX <div:[3:4->3:7] dangerous[3:8->3:17]=...[3:8->3:17]> _children:None
-posCursor:[3:17] posNoWhite:[3:16] Found expr:[3:8->3:17]
-Pexp_ident dangerous:[3:8->3:17]
 Completable: Cjsx([div], dangerous, [dangerous])
 [{
     "label": "dangerouslySetInnerHTML",

analysis/tests/src/expected/Jsx.res.txt

@@ -12,8 +12,6 @@ Completable: Cpath Value[fi]
 Complete tests/src/Jsx.res 11:20
 posCursor:[11:20] posNoWhite:[11:19] Found expr:[11:4->11:20]
 JSX <M:[11:4->11:5] second[11:6->11:12]=...[11:13->11:18] f[11:19->11:20]=...[11:19->11:20]> _children:None
-posCursor:[11:20] posNoWhite:[11:19] Found expr:[11:19->11:20]
-Pexp_ident f:[11:19->11:20]
 Completable: Cjsx([M], f, [second, f])
 [{
     "label": "first",
@@ -32,8 +30,6 @@ Completable: Cjsx([M], f, [second, f])
 Complete tests/src/Jsx.res 14:13
 posCursor:[14:13] posNoWhite:[14:12] Found expr:[14:12->14:13]
 JSX <M:[14:12->14:13] > _children:None
-posCursor:[14:13] posNoWhite:[14:12] Found expr:[14:12->14:13]
-Pexp_ident M.createElement:[14:12->14:13]
 Completable: Cpath Module[M]
 [{
     "label": "M",
@@ -58,8 +54,6 @@ Completable: Cpath Module[M]
 Complete tests/src/Jsx.res 22:19
 posCursor:[22:19] posNoWhite:[22:18] Found expr:[22:4->22:19]
 JSX <M:[22:4->22:5] prop[22:6->22:10]=...[22:12->22:16] k[22:18->22:19]=...[22:18->22:19]> _children:None
-posCursor:[22:19] posNoWhite:[22:18] Found expr:[22:18->22:19]
-Pexp_ident k:[22:18->22:19]
 Completable: Cjsx([M], k, [prop, k])
 [{
     "label": "key",
@@ -72,8 +66,6 @@ Completable: Cjsx([M], k, [prop, k])
 Complete tests/src/Jsx.res 25:17
 posCursor:[25:17] posNoWhite:[25:16] Found expr:[25:4->25:17]
 JSX <M:[25:4->25:5] prop[25:6->25:10]=...[25:11->25:15] k[25:16->25:17]=...[25:16->25:17]> _children:None
-posCursor:[25:17] posNoWhite:[25:16] Found expr:[25:16->25:17]
-Pexp_ident k:[25:16->25:17]
 Completable: Cjsx([M], k, [prop, k])
 [{
     "label": "key",
@@ -86,8 +78,6 @@ Completable: Cjsx([M], k, [prop, k])
 Complete tests/src/Jsx.res 28:21
 posCursor:[28:21] posNoWhite:[28:20] Found expr:[28:4->28:21]
 JSX <M:[28:4->28:5] prop[28:6->28:10]=...[28:11->28:19] k[28:20->28:21]=...[28:20->28:21]> _children:None
-posCursor:[28:21] posNoWhite:[28:20] Found expr:[28:20->28:21]
-Pexp_ident k:[28:20->28:21]
 Completable: Cjsx([M], k, [prop, k])
 [{
     "label": "key",
@@ -100,8 +90,6 @@ Completable: Cjsx([M], k, [prop, k])
 Complete tests/src/Jsx.res 31:24
 posCursor:[31:24] posNoWhite:[31:23] Found expr:[31:4->31:24]
 JSX <M:[31:4->31:5] prop[31:6->31:10]=...[31:11->31:22] k[31:23->31:24]=...[31:23->31:24]> _children:None
-posCursor:[31:24] posNoWhite:[31:23] Found expr:[31:23->31:24]
-Pexp_ident k:[31:23->31:24]
 Completable: Cjsx([M], k, [prop, k])
 [{
     "label": "key",
@@ -114,8 +102,6 @@ Completable: Cjsx([M], k, [prop, k])
 Complete tests/src/Jsx.res 34:18
 posCursor:[34:18] posNoWhite:[34:17] Found expr:[34:4->34:18]
 JSX <M:[34:4->34:5] prop[34:6->34:10]=...[34:12->34:16] k[34:17->34:18]=...[34:17->34:18]> _children:None
-posCursor:[34:18] posNoWhite:[34:17] Found expr:[34:17->34:18]
-Pexp_ident k:[34:17->34:18]
 Completable: Cjsx([M], k, [prop, k])
 [{
     "label": "key",
@@ -128,8 +114,6 @@ Completable: Cjsx([M], k, [prop, k])
 Complete tests/src/Jsx.res 37:16
 posCursor:[37:16] posNoWhite:[37:15] Found expr:[37:4->37:16]
 JSX <M:[37:4->37:5] prop[37:6->37:10]=...[37:11->37:14] k[37:15->37:16]=...[37:15->37:16]> _children:None
-posCursor:[37:16] posNoWhite:[37:15] Found expr:[37:15->37:16]
-Pexp_ident k:[37:15->37:16]
 Completable: Cjsx([M], k, [prop, k])
 [{
     "label": "key",
@@ -142,8 +126,6 @@ Completable: Cjsx([M], k, [prop, k])
 Complete tests/src/Jsx.res 40:17
 posCursor:[40:17] posNoWhite:[40:16] Found expr:[40:4->40:17]
 JSX <M:[40:4->40:5] prop[40:6->40:10]=...[40:11->40:15] k[40:16->40:17]=...[40:16->40:17]> _children:None
-posCursor:[40:17] posNoWhite:[40:16] Found expr:[40:16->40:17]
-Pexp_ident k:[40:16->40:17]
 Completable: Cjsx([M], k, [prop, k])
 [{
     "label": "key",
@@ -156,8 +138,6 @@ Completable: Cjsx([M], k, [prop, k])
 Complete tests/src/Jsx.res 43:18
 posCursor:[43:18] posNoWhite:[43:17] Found expr:[43:4->43:18]
 JSX <M:[43:4->43:5] prop[43:6->43:10]=...[43:11->43:16] k[43:17->43:18]=...[43:17->43:18]> _children:None
-posCursor:[43:18] posNoWhite:[43:17] Found expr:[43:17->43:18]
-Pexp_ident k:[43:17->43:18]
 Completable: Cjsx([M], k, [prop, k])
 [{
     "label": "key",
@@ -170,8 +150,6 @@ Completable: Cjsx([M], k, [prop, k])
 Complete tests/src/Jsx.res 46:16
 posCursor:[46:16] posNoWhite:[46:15] Found expr:[46:4->46:16]
 JSX <M:[46:4->46:5] prop[46:6->46:10]=...[46:11->46:14] k[46:15->46:16]=...[46:15->46:16]> _children:None
-posCursor:[46:16] posNoWhite:[46:15] Found expr:[46:15->46:16]
-Pexp_ident k:[46:15->46:16]
 Completable: Cjsx([M], k, [prop, k])
 [{
     "label": "key",
@@ -184,8 +162,6 @@ Completable: Cjsx([M], k, [prop, k])
 Complete tests/src/Jsx.res 49:27
 posCursor:[49:27] posNoWhite:[49:26] Found expr:[49:4->49:27]
 JSX <M:[49:4->49:5] prop[49:6->49:10]=...[49:11->49:25] k[49:26->49:27]=...[49:26->49:27]> _children:None
-posCursor:[49:27] posNoWhite:[49:26] Found expr:[49:26->49:27]
-Pexp_ident k:[49:26->49:27]
 Completable: Cjsx([M], k, [prop, k])
 [{
     "label": "key",
@@ -198,8 +174,6 @@ Completable: Cjsx([M], k, [prop, k])
 Complete tests/src/Jsx.res 52:38
 posCursor:[52:38] posNoWhite:[52:37] Found expr:[52:4->52:38]
 JSX <M:[52:4->52:5] prop[52:6->52:10]=...[52:11->52:36] k[52:37->52:38]=...[52:37->52:38]> _children:None
-posCursor:[52:38] posNoWhite:[52:37] Found expr:[52:37->52:38]
-Pexp_ident k:[52:37->52:38]
 Completable: Cjsx([M], k, [prop, k])
 [{
     "label": "key",
@@ -212,8 +186,6 @@ Completable: Cjsx([M], k, [prop, k])
 Complete tests/src/Jsx.res 55:25
 posCursor:[55:25] posNoWhite:[55:24] Found expr:[55:4->55:25]
 JSX <M:[55:4->55:5] prop[55:6->55:10]=...[55:11->55:23] k[55:24->55:25]=...[55:24->55:25]> _children:None
-posCursor:[55:25] posNoWhite:[55:24] Found expr:[55:24->55:25]
-Pexp_ident k:[55:24->55:25]
 Completable: Cjsx([M], k, [prop, k])
 [{
     "label": "key",
@@ -229,8 +201,6 @@ Definition tests/src/Jsx.res 58:11
 Complete tests/src/Jsx.res 68:10
 posCursor:[68:10] posNoWhite:[68:9] Found expr:[68:4->68:10]
 JSX <Ext:[68:4->68:7] al[68:8->68:10]=...[68:8->68:10]> _children:None
-posCursor:[68:10] posNoWhite:[68:9] Found expr:[68:8->68:10]
-Pexp_ident al:[68:8->68:10]
 Completable: Cjsx([Ext], al, [al])
 [{
     "label": "align",
@@ -243,16 +213,12 @@ Completable: Cjsx([Ext], al, [al])
 Complete tests/src/Jsx.res 71:11
 posCursor:[71:11] posNoWhite:[71:10] Found expr:[71:4->71:11]
 JSX <M:[71:4->71:5] first[71:6->71:11]=...[71:6->71:11]> _children:None
-posCursor:[71:11] posNoWhite:[71:10] Found expr:[71:6->71:11]
-Pexp_ident first:[71:6->71:11]
 Completable: Cjsx([M], first, [first])
 []
 
 Complete tests/src/Jsx.res 74:16
 posCursor:[74:16] posNoWhite:[74:15] Found expr:[74:4->74:16]
 JSX <M:[74:4->74:5] first[74:6->74:11]=...[74:12->74:14] k[74:15->74:16]=...[74:15->74:16]> _children:None
-posCursor:[74:16] posNoWhite:[74:15] Found expr:[74:15->74:16]
-Pexp_ident k:[74:15->74:16]
 Completable: Cjsx([M], k, [first, k])
 [{
     "label": "key",
@@ -265,8 +231,6 @@ Completable: Cjsx([M], k, [first, k])
 Complete tests/src/Jsx.res 77:23
 posCursor:[77:23] posNoWhite:[77:22] Found expr:[77:4->77:23]
 JSX <M:[77:4->77:5] first[77:6->77:11]=...[77:19->77:21] k[77:22->77:23]=...[77:22->77:23]> _children:None
-posCursor:[77:23] posNoWhite:[77:22] Found expr:[77:22->77:23]
-Pexp_ident k:[77:22->77:23]
 Completable: Cjsx([M], k, [first, k])
 [{
     "label": "key",
@@ -290,8 +254,6 @@ Pexp_construct []:__ghost__[80:5->83:20] None
 Complete tests/src/Jsx.res 89:16
 posCursor:[89:16] posNoWhite:[89:15] Found expr:[89:4->89:16]
 JSX <WithChildren:[89:4->89:16] > _children:None
-posCursor:[89:16] posNoWhite:[89:15] Found expr:[89:4->89:16]
-Pexp_ident WithChildren.createElement:[89:4->89:16]
 Completable: Cpath Module[WithChildren]
 [{
     "label": "WithChildren",
@@ -304,8 +266,6 @@ Completable: Cpath Module[WithChildren]
 Complete tests/src/Jsx.res 91:18
 posCursor:[91:18] posNoWhite:[91:17] Found expr:[91:4->91:18]
 JSX <WithChildren:[91:4->91:16] n[91:17->91:18]=...[91:17->91:18]> _children:None
-posCursor:[91:18] posNoWhite:[91:17] Found expr:[91:17->91:18]
-Pexp_ident n:[91:17->91:18]
 Completable: Cjsx([WithChildren], n, [n])
 [{
     "label": "name",
@@ -350,8 +310,6 @@ Completable: Cpath Value[x].th
 Complete tests/src/Jsx.res 106:28
 posCursor:[106:28] posNoWhite:[106:27] Found expr:[106:11->111:3]
 Pexp_ident DefineSomeFields.:[106:11->111:3]
-posCursor:[106:28] posNoWhite:[106:27] Found expr:[0:-1->111:70]
-Pexp_apply ...[111:6->111:7] (...[111:8->111:70])
 Completable: Cpath Value[DefineSomeFields, ""]
 [{
     "label": "thisValue",
@@ -417,8 +375,6 @@ JSX <div:[135:3->135:6] x[136:5->136:6]=...[138:4->138:8]> _children:None
 Complete tests/src/Jsx.res 150:21
 posCursor:[150:21] posNoWhite:[150:20] Found expr:[150:12->150:32]
 JSX <Nested.Co:[150:12->150:21] name[150:22->150:26]=...[150:27->150:29]> _children:150:30
-posCursor:[150:21] posNoWhite:[150:20] Found expr:[150:12->150:21]
-Pexp_ident Nested.Co.createElement:[150:12->150:21]
 Completable: Cpath Module[Nested, Co]
 [{
     "label": "Comp",
@@ -431,8 +387,6 @@ Completable: Cpath Module[Nested, Co]
 Complete tests/src/Jsx.res 153:19
 posCursor:[153:19] posNoWhite:[153:18] Found expr:[153:12->153:25]
 JSX <Nested.name:[153:12->153:24] > _children:None
-posCursor:[153:19] posNoWhite:[153:18] Found expr:[153:12->153:24]
-Pexp_ident Nested.name.createElement:[153:12->153:24]
 Completable: Cpath Module[Nested, ""]
 [{
     "label": "Comp",

analysis/tests/src/expected/RecordCompletion.res.txt

@@ -1,7 +1,5 @@
 Complete tests/src/RecordCompletion.res 8:9
 posCursor:[8:9] posNoWhite:[8:8] Found expr:[8:3->8:9]
-posCursor:[8:9] posNoWhite:[8:8] Found expr:[8:8->8:9]
-Pexp_ident m:[8:8->8:9]
 Completable: Cpath Value[t].n->m
 [{
     "label": "Js.Array2.mapi",
@@ -19,8 +17,6 @@ Completable: Cpath Value[t].n->m
 
 Complete tests/src/RecordCompletion.res 11:13
 posCursor:[11:13] posNoWhite:[11:12] Found expr:[11:3->11:13]
-posCursor:[11:13] posNoWhite:[11:12] Found expr:[11:12->11:13]
-Pexp_ident m:[11:12->11:13]
 Completable: Cpath Value[t2].n2.n->m
 [{
     "label": "Js.Array2.mapi",