restore old behavior when config is not activated

Author: zth

analysis/src/ProcessExtra.ml

@@ -374,7 +374,8 @@ let pat ~(file : File.t) ~env ~extra (iter : Tast_iterator.iterator)
   (match pattern.pat_desc with
   | Tpat_record (items, _) ->
     addForRecord ~env ~extra ~recordType:pattern.pat_type items;
-    addLocItem extra pattern.pat_loc (OtherPattern pattern.pat_type)
+    if !Cfg.useRevampedCompletion then
+      addLocItem extra pattern.pat_loc (OtherPattern pattern.pat_type)
   | Tpat_construct (lident, constructor, _) ->
     addForConstructor ~env ~extra pattern.pat_type lident constructor
   | Tpat_alias (_inner, ident, name) ->
@@ -384,7 +385,9 @@ let pat ~(file : File.t) ~env ~extra (iter : Tast_iterator.iterator)
     (* Log.log("Pattern " ++ name.txt); *)
     let stamp = Ident.binding_time ident in
     addForPattern stamp name
-  | _ -> addLocItem extra pattern.pat_loc (OtherPattern pattern.pat_type));
+  | _ ->
+    if !Cfg.useRevampedCompletion then
+      addLocItem extra pattern.pat_loc (OtherPattern pattern.pat_type));
   Tast_iterator.default_iterator.pat iter pattern
 
 let expr ~env ~(extra : extra) (iter : Tast_iterator.iterator)
@@ -399,7 +402,8 @@ let expr ~env ~(extra : extra) (iter : Tast_iterator.iterator)
              match item with
              | Typedtree.Overridden (loc, _) -> Some (loc, desc, (), opt)
              | _ -> None));
-    addLocItem extra expression.exp_loc (OtherExpression expression.exp_type)
+    if !Cfg.useRevampedCompletion then
+      addLocItem extra expression.exp_loc (OtherExpression expression.exp_type)
   | Texp_constant constant ->
     addLocItem extra expression.exp_loc (Constant constant)
   (* Skip unit and list literals *)
@@ -411,7 +415,7 @@ let expr ~env ~(extra : extra) (iter : Tast_iterator.iterator)
   | Texp_field (inner, lident, _label_description) ->
     addForField ~env ~extra ~recordType:inner.exp_type
       ~fieldType:expression.exp_type lident
-  | Texp_apply {funct; args} ->
+  | Texp_apply {funct; args} when !Cfg.useRevampedCompletion ->
     args
     |> List.iter (fun (label, _) ->
            match label with

tests/analysis_tests/tests/src/expected/Hover.res.txt

@@ -19,7 +19,7 @@ heuristic for: [makeProps, make, createElement], give the loc of `make`
 {"contents": {"kind": "markdown", "value": "```rescript\nint\n```"}}
 
 Hover src/Hover.res 33:4
-{"contents": {"kind": "markdown", "value": "```rescript\nunit => int\n```"}}
+{"contents": {"kind": "markdown", "value": "```rescript\nunit => int\n```\n---\nDoc comment for functionWithTypeAnnotation"}}
 
 Hover src/Hover.res 37:13
 {"contents": {"kind": "markdown", "value": "```rescript\nstring\n```"}}
@@ -99,10 +99,10 @@ Hover src/Hover.res 148:6
 {"contents": {"kind": "markdown", "value": "```rescript\nint\n```\n---\n doc comment 2 "}}
 
 Hover src/Hover.res 165:23
-{"contents": {"kind": "markdown", "value": "```rescript\nfoo<bar>\n```"}}
+{"contents": {"kind": "markdown", "value": "```rescript\nfoo<bar>\n```\n\n---\n\n```\n \n```\n```rescript\ntype foo<'a> = {content: 'a, zzz: string}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Hover.res%22%2C161%2C2%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype bar = {age: int}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Hover.res%22%2C162%2C2%5D)\n"}}
 
 Hover src/Hover.res 167:22
-{"contents": {"kind": "markdown", "value": "```rescript\nfoobar\n```"}}
+{"contents": {"kind": "markdown", "value": "```rescript\nfoobar\n```\n\n---\n\n```\n \n```\n```rescript\ntype foobar = foo<bar>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Hover.res%22%2C163%2C2%5D)\n"}}
 
 Complete src/Hover.res 170:16
 posCursor:[170:16] posNoWhite:[170:15] Found expr:[170:5->170:16]
@@ -244,7 +244,7 @@ Hover src/Hover.res 197:4
 {"contents": {"kind": "markdown", "value": "```rescript\nCompV4.props<int, string> => React.element\n```\n\n---\n\n```\n \n```\n```rescript\ntype CompV4.props<'n, 's> = {n?: 'n, s: 's}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Hover.res%22%2C190%2C2%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype React.element = Jsx.element\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22React.res%22%2C0%2C0%5D)\n"}}
 
 Hover src/Hover.res 202:16
-{"contents": {"kind": "markdown", "value": "```rescript\nuseR\n```"}}
+{"contents": {"kind": "markdown", "value": "```rescript\nuseR\n```\n\n---\n\n```\n \n```\n```rescript\ntype useR = {x: int, y: list<option<r<float>>>}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Hover.res%22%2C200%2C0%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype r<'a> = {i: 'a, f: float}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Hover.res%22%2C101%2C0%5D)\n"}}
 
 Hover src/Hover.res 210:13
 Nothing at that position. Now trying to use completion.

tests/analysis_tests/tests/src/expected/InlayHint.res.txt

@@ -1,10 +1,34 @@
 Inlay Hint src/InlayHint.res 1:34
 [{
+    "position": {"line": 33, "character": 14},
+    "label": ": int",
+    "kind": 1,
+    "paddingLeft": true,
+    "paddingRight": false
+}, {
+    "position": {"line": 33, "character": 9},
+    "label": ": string",
+    "kind": 1,
+    "paddingLeft": true,
+    "paddingRight": false
+}, {
     "position": {"line": 28, "character": 9},
     "label": ": foo",
     "kind": 1,
     "paddingLeft": true,
     "paddingRight": false
+}, {
+    "position": {"line": 26, "character": 23},
+    "label": ": (string, string)",
+    "kind": 1,
+    "paddingLeft": true,
+    "paddingRight": false
+}, {
+    "position": {"line": 18, "character": 9},
+    "label": ": string",
+    "kind": 1,
+    "paddingLeft": true,
+    "paddingRight": false
 }, {
     "position": {"line": 16, "character": 9},
     "label": ": (string, string)",

tests/analysis_tests/tests/src/expected/NestedRecordsHover.res.txt

@@ -2,14 +2,14 @@ Hover src/NestedRecordsHover.res 8:7
 {"contents": {"kind": "markdown", "value": "```rescript\noptions\n```\n\n---\n\n```\n \n```\n```rescript\ntype options = {\n  extra?: {\n    name: string,\n    superExtra?: {age: int},\n    otherExtra: option<\n      {\n        test: bool,\n        anotherInlined: {record: bool},\n      },\n    >,\n  },\n}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22NestedRecordsHover.res%22%2C0%2C0%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype options.extra = {\n  name: string,\n  superExtra?: {age: int},\n  otherExtra: option<\n    {\n      test: bool,\n      anotherInlined: {record: bool},\n    },\n  >,\n}\n```\n"}}
 
 Hover src/NestedRecordsHover.res 11:6
-{"contents": {"kind": "markdown", "value": "```rescript\n\\\"options.extra\"\n```"}}
+{"contents": {"kind": "markdown", "value": "```rescript\ntype options.extra = {\n  name: string,\n  superExtra?: {age: int},\n  otherExtra: option<\n    {\n      test: bool,\n      anotherInlined: {record: bool},\n    },\n  >,\n}\n```"}}
 
 Hover src/NestedRecordsHover.res 14:8
-{"contents": {"kind": "markdown", "value": "```rescript\n\\\"options.extra.superExtra\"\n```"}}
+{"contents": {"kind": "markdown", "value": "```rescript\ntype options.extra.superExtra = {age: int}\n```"}}
 
 Hover src/NestedRecordsHover.res 18:9
-{"contents": {"kind": "markdown", "value": "```rescript\n\\\"options.extra.otherExtra\"\n```"}}
+{"contents": {"kind": "markdown", "value": "```rescript\ntype options.extra.otherExtra = {\n  test: bool,\n  anotherInlined: {record: bool},\n}\n```"}}
 
 Hover src/NestedRecordsHover.res 21:11
-{"contents": {"kind": "markdown", "value": "```rescript\n\\\"options.extra.otherExtra.anotherInlined\"\n```"}}
+{"contents": {"kind": "markdown", "value": "```rescript\ntype options.extra.otherExtra.anotherInlined = {\n  record: bool,\n}\n```"}}
 

tests/analysis_tests/tests/src/expected/TypeDefinition.res.txt

@@ -8,7 +8,7 @@ TypeDefinition src/TypeDefinition.res 8:4
 {"uri": "TypeDefinition.res", "range": {"start": {"line": 2, "character": 0}, "end": {"line": 2, "character": 28}}}
 
 TypeDefinition src/TypeDefinition.res 13:4
-null
+{"uri": "TypeDefinition.res", "range": {"start": {"line": 11, "character": 0}, "end": {"line": 11, "character": 26}}}
 
 TypeDefinition src/TypeDefinition.res 16:13
 {"uri": "TypeDefinition.res", "range": {"start": {"line": 2, "character": 0}, "end": {"line": 2, "character": 28}}}