fix QA tests

Author: vasily-kirichenko

src/fsharp/FSComp.txt

@@ -1334,4 +1334,4 @@ tcGlobalsSystemTypeNotFound,"The system type '%s' was required but no referenced
 3213,typrelMemberHasMultiplePossibleDispatchSlots,"The member '%s' matches multiple overloads of the same method.\nPlease restrict it to one of the following:%s."
 3214,methodIsNotStatic,"Method or object constructor '%s' is not static"
 3215,expressionHasNoName,"This expression does not have a name."
-3216,chkNoFirstClassNameOf,"First-class uses of the 'nameof' operator is not permitted"
+3216,chkNoFirstClassNameOf,"First-class uses of the 'nameof' operator is not permitted."

src/fsharp/TypeChecker.fs

@@ -8269,7 +8269,7 @@ and TcFunctionApplicationThen cenv overallTy env tpenv mExprAndArg expr exprty (
                 // generate fake `range` for the constant the `nameof(..)` we are substituting
                 let constRange = mkRange r.FileName r.Start (mkPos r.StartLine (r.StartColumn + argIdent.idText.Length + 2)) // `2` are for quotes
                 TcDelayed cenv overallTy env tpenv mExprAndArg (ApplicableExpr(cenv, Expr.Const(Const.String(argIdent.idText), constRange, cenv.g.string_ty), true)) cenv.g.string_ty ExprAtomicFlag.Atomic delayed
-            | _ -> error (Error(FSComp.SR.expressionHasNoName(), synArg.Range))
+            | _ -> error (Error(FSComp.SR.expressionHasNoName(), expr.Range))
         | _ ->
             // Notice the special case 'seq { ... }'. In this case 'seq' is actually a function in the F# library.
             // Set a flag in the syntax tree to say we noticed a leading 'seq'

tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfAdditionExpr.fs

@@ -1,6 +1,6 @@
 // #Regression #Conformance #DataExpressions 
 // Verify that nameof doesn't work on const string
-//<Expects id="FS3199" span="(5,9)" status="error">This expression does not have a name.</Expects>
+//<Expects id="FS3215" span="(5,9)" status="error">This expression does not have a name.</Expects>
 
 let x = nameof(1+2)
 

tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfAppliedFunction.fs

@@ -1,6 +1,6 @@
 // #Regression #Conformance #DataExpressions 
 // Verify that nameof doesn't work on applied functions
-//<Expects id="FS3199" span="(6,9)" status="error">This expression does not have a name.</Expects>
+//<Expects id="FS3215" span="(6,9)" status="error">This expression does not have a name.</Expects>
 
 let f() = 1
 let x = nameof(f())

tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfAsAFunction.fs

@@ -1,6 +1,6 @@
 // #Regression #Conformance #DataExpressions 
 // Verify that nameof can't be used as a function.
-//<Expects id="FS3199" span="(5,9)" status="error">This expression does not have a name.</Expects>
+//<Expects id="FS3216" span="(5,9)" status="error">First-class uses of the 'nameof' operator is not permitted</Expects>
 
 let f = nameof
 

tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfDictLookup.fs

@@ -1,6 +1,6 @@
 // #Regression #Conformance #DataExpressions 
 // Verify that nameof doesn't work on dictionary lookup
-//<Expects id="FS3199" span="(6,9)" status="error">This expression does not have a name.</Expects>
+//<Expects id="FS3215" span="(6,9)" status="error">This expression does not have a name.</Expects>
 
 let dict = new System.Collections.Generic.Dictionary<int,string>()
 let b = nameof(dict.[2])

tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfIntConst.fs

@@ -1,6 +1,6 @@
 // #Regression #Conformance #DataExpressions 
 // Verify that nameof doesn't work on const int
-//<Expects id="FS3199" span="(5,9)" status="error">This expression does not have a name.</Expects>
+//<Expects id="FS3215" span="(5,9)" status="error">This expression does not have a name.</Expects>
 
 let x = nameof 1
 

tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfIntegerAppliedFunction.fs

@@ -1,6 +1,6 @@
 // #Regression #Conformance #DataExpressions 
 // Verify that nameof doesn't work on applied functions
-//<Expects id="FS3199" span="(6,9)" status="error">This expression does not have a name.</Expects>
+//<Expects id="FS3215" span="(6,9)" status="error">This expression does not have a name.</Expects>
 
 let f x = 1 * x
 let x = nameof(f 2)

tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfParameterAppliedFunction.fs

@@ -1,6 +1,6 @@
 // #Regression #Conformance #DataExpressions 
 // Verify that nameof doesn't work on applied functions
-//<Expects id="FS3199" span="(7,9)" status="error">This expression does not have a name.</Expects>
+//<Expects id="FS3215" span="(7,9)" status="error">This expression does not have a name.</Expects>
 
 let f x y = x y
 let z x = 1 * x

tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfPartiallyAppliedFunction.fs

@@ -1,6 +1,6 @@
 // #Regression #Conformance #DataExpressions 
 // Verify that nameof doesn't work on partially applied functions
-//<Expects id="FS3199" span="(6,9)" status="error">This expression does not have a name.</Expects>
+//<Expects id="FS3215" span="(6,9)" status="error">This expression does not have a name.</Expects>
 
 let f x y = y * x
 let x = nameof(f 2)