Updated fsstrings

Author: ncave

fcs/fcs-fable/fsstrings.fs

@@ -774,19 +774,19 @@ let resources =
         "This expression is a function value, i.e. is missing arguments. Its type is {0}."
       );
       ( "UnitTypeExpected",
-        "The result of this expression is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'."
+        "The result of this expression has type '{0}' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'."
       );
       ( "UnitTypeExpectedWithEquality",
-        "The result of this equality expression is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'."
+        "The result of this equality expression has type '{0}' and is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'."
       );
       ( "UnitTypeExpectedWithPossiblePropertySetter",
-        "The result of this equality expression is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'. If you intended to set a value to a property, then use the '<-' operator e.g. '{0}.{1} <- expression'."
+        "The result of this equality expression has type '{0}' and is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'. If you intended to set a value to a property, then use the '<-' operator e.g. '{1}.{2} <- expression'."
       );
       ( "UnitTypeExpectedWithPossibleAssignment",
-        "The result of this equality expression is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'. If you intended to mutate a value, then mark the value 'mutable' and use the '<-' operator e.g. '{0} <- expression'."
+        "The result of this equality expression has type '{0}' and is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'. If you intended to mutate a value, then mark the value 'mutable' and use the '<-' operator e.g. '{1} <- expression'."
       );
       ( "UnitTypeExpectedWithPossibleAssignmentToMutable",
-        "The result of this equality expression is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'. If you intended to mutate a value, then use the '<-' operator e.g. '{0} <- expression'."
+        "The result of this equality expression has type '{0}' and is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'. If you intended to mutate a value, then use the '<-' operator e.g. '{1} <- expression'."
       );
       ( "RecursiveUseCheckedAtRuntime",
         "This recursive use will be checked for initialization-soundness at runtime. This warning is usually harmless, and may be suppressed by using '#nowarn \"21\"' or '--nowarn:21'."

fcs/fcs-fable/test/app.fs

@@ -34,13 +34,15 @@ let writeAllText (filePath:string) (text:string) = File.WriteAllText (filePath,
 let main argv =
     printfn "Parsing begins..."
 
-    let checker = InteractiveChecker.Create(references, readAllBytes)
+    let defines = [||]
+    let checker = InteractiveChecker.Create(references, readAllBytes, defines)
 
+    let projectFileName = "project"
     let fileName = "test_script.fsx"
     let source = readAllText fileName
 
-    // let parseResults = checker.ParseScript(fileName,source)
-    let parseResults, typeCheckResults, projectResults = checker.ParseAndCheckScript(fileName, source)
+    //let parseResults, typeCheckResults, projectResults = checker.ParseAndCheckProject(projectFileName, [|fileName|], [|source|])
+    let parseResults, typeCheckResults, projectResults = checker.ParseAndCheckScript(projectFileName, fileName, source)
 
     printfn "parseResults.ParseHadErrors: %A" parseResults.ParseHadErrors
     printfn "parseResults.Errors: %A" parseResults.Errors
@@ -72,19 +74,19 @@ let main argv =
     let inputLines = source.Split('\n')
 
     async {
-        // Get tool tip at the specified location
-        let! tip = typeCheckResults.GetToolTipText(4, 7, inputLines.[3], ["foo"], FSharpTokenTag.IDENT)
-        (sprintf "%A" tip).Replace("\n","") |> printfn "\n---> ToolTip Text = %A" // should be "FSharpToolTipText [...]"
-
-        // Get declarations (autocomplete) for msg
-        let partialName = { QualifyingIdents = []; PartialIdent = "msg"; EndColumn = 17; LastDotPos = None }
-        let! decls = typeCheckResults.GetDeclarationListInfo(Some parseResults, 6, inputLines.[5], partialName, (fun _ -> []), fun _ -> false)
-        [ for item in decls.Items -> item.Name ] |> printfn "\n---> msg AutoComplete = %A" // should be string methods
-
-        // Get declarations (autocomplete) for canvas
-        let partialName = { QualifyingIdents = []; PartialIdent = "canvas"; EndColumn = 10; LastDotPos = None }
-        let! decls = typeCheckResults.GetDeclarationListInfo(Some parseResults, 8, inputLines.[7], partialName, (fun _ -> []), fun _ -> false)
-        [ for item in decls.Items -> item.Name ] |> printfn "\n---> canvas AutoComplete = %A"
+       // Get tool tip at the specified location
+       let! tip = typeCheckResults.GetToolTipText(4, 7, inputLines.[3], ["foo"], FSharpTokenTag.IDENT)
+       (sprintf "%A" tip).Replace("\n","") |> printfn "\n---> ToolTip Text = %A" // should be "FSharpToolTipText [...]"
+
+       // Get declarations (autocomplete) for msg
+       let partialName = { QualifyingIdents = []; PartialIdent = "msg"; EndColumn = 17; LastDotPos = None }
+       let! decls = typeCheckResults.GetDeclarationListInfo(Some parseResults, 6, inputLines.[5], partialName, (fun _ -> []), fun _ -> false)
+       [ for item in decls.Items -> item.Name ] |> printfn "\n---> msg AutoComplete = %A" // should be string methods
+
+       // Get declarations (autocomplete) for canvas
+       let partialName = { QualifyingIdents = []; PartialIdent = "canvas"; EndColumn = 10; LastDotPos = None }
+       let! decls = typeCheckResults.GetDeclarationListInfo(Some parseResults, 8, inputLines.[7], partialName, (fun _ -> []), fun _ -> false)
+       [ for item in decls.Items -> item.Name ] |> printfn "\n---> canvas AutoComplete = %A"
     } |> Async.StartImmediate
 
     0

fcs/fcs-fable/test/package.json

@@ -13,10 +13,10 @@
     "start": "node out/app"
   },
   "devDependencies": {
-    "babel-core": "^6.26.3",
+    "@babel/core": "^7.1.2",
     "babel-preset-env": "^1.7.0",
-    "fable-splitter": "2.0.0-beta-002",
-    "rollup": "^0.66.2",
-    "rollup-plugin-fable": "2.0.0-beta-001"
+    "fable-splitter": "^2.0.2",
+    "rollup": "^0.66.6",
+    "rollup-plugin-fable": "^2.0.0"
   }
 }