wip

# Conflicts:
#	yarn.lock

# Conflicts:
#	tests/dependencies/rescript-react/package.json
#	yarn.lock

Author: cknitt

analysis/examples/larger-project/package.json

@@ -14,6 +14,6 @@
   },
   "dependencies": {
     "@glennsl/bs-json": "^5.0.4",
-    "@rescript/react": "^0.10.3"
+    "@rescript/react": "workspace:^"
   }
 }

biome.json

@@ -55,6 +55,7 @@
   "files": {
     "ignore": [
       ".yarn/**",
+      "tests/dependencies/**/src/**",
       "tests/analysis_tests/**/src/**",
       "tests/build_tests/**/src/**",
       "tests/docstring_tests/**",

package.json

@@ -101,6 +101,7 @@
     "tests/analysis_tests/**",
     "tests/docstring_tests",
     "tests/gentype_tests/**",
+    "tests/tests",
     "tests/tools_tests",
     "scripts/res"
   ],

packages/playground/package.json

@@ -10,7 +10,7 @@
     "serve-bundle": "node serve-bundle.mjs"
   },
   "dependencies": {
-    "@rescript/react": "^0.13.1",
+    "@rescript/react": "workspace:^",
     "rescript": "workspace:^"
   },
   "devDependencies": {

tests/analysis_tests/tests-reanalyze/deadcode/expected/deadcode.txt

@@ -359,7 +359,7 @@
   addValueDeclaration +make Hooks.res:63:6 path:+Hooks.RenderPropRequiresConversion
   addRecordLabelDeclaration name Hooks.res:1:16 path:+Hooks.vehicle
   addRecordLabelDeclaration vehicle Hooks.res:4:12 path:+Hooks.props
-  addValueReference Hooks.res:5:26 --> React.res:134:0
+  addValueReference Hooks.res:5:26 --> React.res:135:0
   addTypeReference Hooks.res:10:29 --> Hooks.res:1:16
   addValueReference Hooks.res:10:29 --> Hooks.res:4:12
   addValueReference Hooks.res:10:75 --> Hooks.res:5:7

tests/analysis_tests/tests-reanalyze/deadcode/package.json

@@ -6,7 +6,7 @@
     "clean": "rescript clean"
   },
   "dependencies": {
-    "@rescript/react": "link:../../../dependencies/rescript-react",
+    "@rescript/react": "workspace:^",
     "rescript": "workspace:^"
   }
 }

tests/analysis_tests/tests/package.json

@@ -6,7 +6,7 @@
     "clean": "rescript clean"
   },
   "dependencies": {
-    "@rescript/react": "link:../../dependencies/rescript-react",
+    "@rescript/react": "workspace:^",
     "rescript": "workspace:^"
   }
 }

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

@@ -865,13 +865,13 @@ ContextPath CArgument Value[fnTakingCallback]($2)
 ContextPath Value[fnTakingCallback]
 Path fnTakingCallback
 [{
-    "label": "event => event",
+    "label": "mouse => mouse",
     "kind": 12,
     "tags": [],
     "detail": "ReactEvent.Mouse.t => unit",
     "documentation": null,
     "sortText": "A",
-    "insertText": "${1:event} => ${0:event}",
+    "insertText": "${1:mouse} => ${0:mouse}",
     "insertTextFormat": 2
   }]
 

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

@@ -250,16 +250,7 @@ ContextPath CArgument CArgument Value[reactEventFn]($0)($0)
 ContextPath CArgument Value[reactEventFn]($0)
 ContextPath Value[reactEventFn]
 Path reactEventFn
-CPPipe pathFromEnv:ReactEvent.Mouse found:false
-Path ReactEvent.Mouse.pr
-Path pr
-[{
-    "label": "ReactEvent.Mouse.preventDefault",
-    "kind": 12,
-    "tags": [],
-    "detail": "t => unit",
-    "documentation": null
-  }]
+[]
 
 Complete src/CompletionInferValues.res 41:50
 posCursor:[41:50] posNoWhite:[41:49] Found expr:[41:11->41:56]
@@ -275,17 +266,7 @@ Path event
 ContextPath CArgument CJsxPropValue [div] onMouseEnter($0)
 ContextPath CJsxPropValue [div] onMouseEnter
 Path ReactDOM.domProps
-Path JsxDOM.domProps
-CPPipe pathFromEnv:JsxEvent.Mouse found:false
-Path JsxEvent.Mouse.pr
-Path pr
-[{
-    "label": "JsxEvent.Mouse.preventDefault",
-    "kind": 12,
-    "tags": [],
-    "detail": "t => unit",
-    "documentation": null
-  }]
+[]
 
 Complete src/CompletionInferValues.res 44:50
 posCursor:[44:50] posNoWhite:[44:49] Found expr:[44:11->44:56]
@@ -832,22 +813,7 @@ ContextPath CArgument CArgument Value[fn2](~cb)($0)
 ContextPath CArgument Value[fn2](~cb)
 ContextPath Value[fn2]
 Path fn2
-CPPipe pathFromEnv:ReactDOM.Client.Root found:false
-Path ReactDOM.Client.Root.
-Path 
-[{
-    "label": "ReactDOM.Client.Root.unmount",
-    "kind": 12,
-    "tags": [],
-    "detail": "(t, unit) => unit",
-    "documentation": null
-  }, {
-    "label": "ReactDOM.Client.Root.render",
-    "kind": 12,
-    "tags": [],
-    "detail": "(t, React.element) => unit",
-    "documentation": null
-  }]
+[]
 
 Complete src/CompletionInferValues.res 139:30
 posCursor:[139:30] posNoWhite:[139:29] Found expr:[139:3->139:33]
@@ -974,22 +940,7 @@ ContextPath CArgument CArgument Value[CompletionSupport2, makeRenderer](~render)
 ContextPath CArgument Value[CompletionSupport2, makeRenderer](~render)
 ContextPath Value[CompletionSupport2, makeRenderer]
 Path CompletionSupport2.makeRenderer
-CPPipe pathFromEnv:ReactDOM.Client.Root found:false
-Path ReactDOM.Client.Root.
-Path 
-[{
-    "label": "ReactDOM.Client.Root.unmount",
-    "kind": 12,
-    "tags": [],
-    "detail": "(t, unit) => unit",
-    "documentation": null
-  }, {
-    "label": "ReactDOM.Client.Root.render",
-    "kind": 12,
-    "tags": [],
-    "detail": "(t, React.element) => unit",
-    "documentation": null
-  }]
+[]
 
 Hover src/CompletionInferValues.res 160:27
 Nothing at that position. Now trying to use completion.

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

@@ -629,14 +629,8 @@ Completable: Cjsx([h1], hidd, [hidd])
 Package opens Stdlib.place holder Pervasives.JsxModules.place holder
 Resolved opens 1 Stdlib
 Path ReactDOM.domProps
-Path JsxDOM.domProps
-[{
-    "label": "hidden",
-    "kind": 4,
-    "tags": [],
-    "detail": "bool",
-    "documentation": null
-  }]
+[completing-lowercase-jsx] could not find element props to complete from.
+[]
 
 Complete src/CompletionJsx.res 61:30
 posCursor:[61:30] posNoWhite:[61:28] Found expr:[61:3->61:29]