fix broken error message and nil formatcodesettings pointer

Author: iisaduan

internal/fourslash/_scripts/failingTests.txt

@@ -98,6 +98,7 @@ TestCompletionForStringLiteralNonrelativeImport2
 TestCompletionForStringLiteralNonrelativeImport3
 TestCompletionForStringLiteralNonrelativeImport4
 TestCompletionForStringLiteralNonrelativeImport8
+TestCompletionForStringLiteralNonrelativeImport9
 TestCompletionForStringLiteralNonrelativeImportTypings1
 TestCompletionForStringLiteralNonrelativeImportTypings2
 TestCompletionForStringLiteralNonrelativeImportTypings3

internal/fourslash/fourslash.go

@@ -631,7 +631,7 @@ func (f *FourslashTest) writeMsg(t *testing.T, msg *lsproto.Message) {
 }
 
 func sendRequest[Params, Resp any](t *testing.T, f *FourslashTest, info lsproto.RequestInfo[Params, Resp], params Params) Resp {
-	// t.Helper()
+	t.Helper()
 	prefix := f.getCurrentPositionPrefix()
 	f.baselineState(t)
 	f.baselineRequestOrNotification(t, info.Method, params)

internal/ls/lsutil/userpreferences.go

@@ -382,7 +382,6 @@ func (p *UserPreferences) ParseWorker(config map[string]any) *UserPreferences {
 		// unstable properties must be named the same as userPreferences
 		p.parseAll(unstable)
 	}
-	formatSettingsParsed := false
 	for name, values := range config {
 		switch name {
 		case "unstable":
@@ -400,7 +399,7 @@ func (p *UserPreferences) ParseWorker(config map[string]any) *UserPreferences {
 		case "workspaceSymbols":
 			p.parseWorkspaceSymbols(values)
 		case "format":
-			formatSettingsParsed = p.FormatCodeSettings.Parse(values) || formatSettingsParsed
+			p.FormatCodeSettings.Parse(values)
 		case "tsserver":
 			// !!!
 		case "tsc":
@@ -409,12 +408,9 @@ func (p *UserPreferences) ParseWorker(config map[string]any) *UserPreferences {
 			// !!!
 		default:
 			p.Set(name, values)
-			formatSettingsParsed = p.FormatCodeSettings.Set(name, values) || formatSettingsParsed
+			p.FormatCodeSettings.Set(name, values)
 		}
 	}
-	if !formatSettingsParsed {
-		p.FormatCodeSettings = nil
-	}
 	return p
 }
 

internal/scanner/scanner.go

@@ -2346,9 +2346,8 @@ func getErrorRangeForArrowFunction(sourceFile *ast.SourceFile, node *ast.Node) c
 		startLine := GetECMALineOfPosition(sourceFile, body.Pos())
 		endLine := GetECMALineOfPosition(sourceFile, body.End())
 		if startLine < endLine {
-			// The arrow function spans multiple lines,
-			// make the error span be the first line, inclusive.
-			return core.NewTextRange(pos, GetECMAEndLinePosition(sourceFile, startLine))
+			// The arrow function spans multiple lines, make the error span be the first line, inclusive.
+			return core.NewTextRange(pos, GetECMAEndLinePosition(sourceFile, startLine)+1)
 		}
 	}
 	return core.NewTextRange(pos, node.End())

testdata/baselines/reference/submodule/compiler/arrowFunctionErrorSpan.errors.txt

@@ -32,15 +32,15 @@ arrowFunctionErrorSpan.ts(52,3): error TS2345: Argument of type '(_: any) => num
 
     // multiline, body
     f(() => {
-      ~~~~~~
+      ~~~~~~~
 !!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
 !!! error TS2345:   Type 'void' is not assignable to type 'number'.
 
     });
 
     // multiline 2, body
     f(() => {
-      ~~~~~~
+      ~~~~~~~
 !!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
 !!! error TS2345:   Type 'void' is not assignable to type 'number'.
 
@@ -85,7 +85,7 @@ arrowFunctionErrorSpan.ts(52,3): error TS2345: Argument of type '(_: any) => num
     // multi line with a comment 2
     f(/*
         */() => { 
-          ~~~~~~~
+          ~~~~~~~~
 !!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
 !!! error TS2345:   Type 'void' is not assignable to type 'number'.
 
@@ -95,7 +95,7 @@ arrowFunctionErrorSpan.ts(52,3): error TS2345: Argument of type '(_: any) => num
     f(  // comment 1
         // comment 2
         () =>
-        ~~~~
+        ~~~~~
 !!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
 !!! error TS2345:   Type 'void' is not assignable to type 'number'.
         // comment 3

testdata/baselines/reference/submodule/compiler/arrowFunctionErrorSpan.errors.txt.diff

@@ -5,7 +5,7 @@ asyncFunctionNoReturnType.ts(1,1): error TS2705: An async function or method in
 !!! error TS2468: Cannot find global value 'Promise'.
 ==== asyncFunctionNoReturnType.ts (1 errors) ====
     async () => {
-    ~~~~~~~~~~~~
+    ~~~~~~~~~~~~~
 !!! error TS2705: An async function or method in ES5 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your '--lib' option.
         if (window)
             return;

testdata/baselines/reference/submodule/compiler/asyncFunctionNoReturnType.errors.txt

@@ -15,7 +15,7 @@ contextualTupleTypeParameterReadonly.ts(10,8): error TS2345: Argument of type '(
     const eacher = each(cases);
 
     eacher((a, b) => {
-           ~~~~~~~~~~
+           ~~~~~~~~~~~
 !!! error TS2345: Argument of type '(a: 1 | 2, b: "1" | "2") => void' is not assignable to parameter of type '(...args: readonly [1, "1"] | readonly [2, "2"]) => any'.
 !!! error TS2345:   Types of parameters 'a' and 'args' are incompatible.
 !!! error TS2345:     Type 'readonly [1, "1"] | readonly [2, "2"]' is not assignable to type '[a: 1 | 2, b: "1" | "2"]'.