fix: correct declareMap reference line number (#2250)

jasonlyu123 · web-flow · commit b05c8eefecb1 · 2024-01-10T13:09:15.000+08:00
diff --git a/packages/language-server/src/plugins/typescript/DocumentSnapshot.ts b/packages/language-server/src/plugins/typescript/DocumentSnapshot.ts
@@ -664,7 +664,7 @@ export class DtsDocumentSnapshot extends JSOrTSDocumentSnapshot implements Docum
         }
 
         return {
-            line: mapped.line,
+            line: mapped.line - 1,
             character: mapped.column,
             uri: pathToUrl(originalFilePath)
         };
diff --git a/packages/language-server/test/plugins/typescript/TypescriptPlugin.test.ts b/packages/language-server/test/plugins/typescript/TypescriptPlugin.test.ts
@@ -569,12 +569,12 @@ describe('TypescriptPlugin', function () {
         assert.deepStrictEqual(definition, [
             <LocationLink>{
                 targetRange: {
-                    end: { line: 1, character: 18 },
-                    start: { line: 1, character: 16 }
+                    end: { line: 0, character: 18 },
+                    start: { line: 0, character: 16 }
                 },
                 targetSelectionRange: {
-                    start: { line: 1, character: 16 },
-                    end: { line: 1, character: 18 }
+                    start: { line: 0, character: 16 },
+                    end: { line: 0, character: 18 }
                 },
                 originSelectionRange: {
                     start: { line: 1, character: 13 },
@@ -592,12 +592,12 @@ describe('TypescriptPlugin', function () {
         assert.deepStrictEqual(definition, [
             <LocationLink>{
                 targetRange: {
-                    end: { line: 1, character: 18 },
-                    start: { line: 1, character: 16 }
+                    end: { line: 0, character: 18 },
+                    start: { line: 0, character: 16 }
                 },
                 targetSelectionRange: {
-                    start: { line: 1, character: 16 },
-                    end: { line: 1, character: 18 }
+                    start: { line: 0, character: 16 },
+                    end: { line: 0, character: 18 }
                 },
                 originSelectionRange: {
                     start: { line: 1, character: 13 },
diff --git a/packages/language-server/test/plugins/typescript/features/FindReferencesProvider.test.ts b/packages/language-server/test/plugins/typescript/features/FindReferencesProvider.test.ts
@@ -319,8 +319,8 @@ describe('FindReferencesProvider', function () {
         assert.deepStrictEqual(references, <Location[]>[
             {
                 range: {
-                    end: { line: 1, character: 18 },
-                    start: { line: 1, character: 16 }
+                    end: { line: 0, character: 18 },
+                    start: { line: 0, character: 16 }
                 },
                 uri: getUri('declaration-map/declaration-map-project/index.ts')
             },
diff --git a/packages/language-server/test/plugins/typescript/features/ImplemenationProvider.test.ts b/packages/language-server/test/plugins/typescript/features/ImplemenationProvider.test.ts
@@ -89,8 +89,8 @@ describe('ImplementationProvider', function () {
         assert.deepStrictEqual(implementations, <Location[]>[
             {
                 range: {
-                    end: { line: 1, character: 18 },
-                    start: { line: 1, character: 16 }
+                    end: { line: 0, character: 18 },
+                    start: { line: 0, character: 16 }
                 },
                 uri: getUri('../declaration-map/declaration-map-project/index.ts')
             }
diff --git a/packages/language-server/test/plugins/typescript/features/TypeDefinitionProvider.test.ts b/packages/language-server/test/plugins/typescript/features/TypeDefinitionProvider.test.ts
@@ -98,8 +98,8 @@ describe('TypeDefinitionProvider', function () {
         assert.deepStrictEqual(typeDefs, <Location[]>[
             {
                 range: {
-                    end: { line: 1, character: 18 },
-                    start: { line: 1, character: 16 }
+                    end: { line: 0, character: 18 },
+                    start: { line: 0, character: 16 }
                 },
                 uri: getUri('../declaration-map/declaration-map-project/index.ts')
             }

Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,7 @@ export class DtsDocumentSnapshot extends JSOrTSDocumentSnapshot implements Docum`
`664`	`664`	`}`
`665`	`665`
`666`	`666`	`return {`
`667`		`- line: mapped.line,`
	`667`	`+ line: mapped.line - 1,`
`668`	`668`	`character: mapped.column,`
`669`	`669`	`uri: pathToUrl(originalFilePath)`
`670`	`670`	`};`
Original file line number	Diff line number	Diff line change
`@@ -89,8 +89,8 @@ describe('ImplementationProvider', function () {`
`89`	`89`	`assert.deepStrictEqual(implementations, <Location[]>[`
`90`	`90`	`{`
`91`	`91`	`range: {`
`92`		`- end: { line: 1, character: 18 },`
`93`		`- start: { line: 1, character: 16 }`
	`92`	`+ end: { line: 0, character: 18 },`
	`93`	`+ start: { line: 0, character: 16 }`
`94`	`94`	`},`
`95`	`95`	`uri: getUri('../declaration-map/declaration-map-project/index.ts')`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,8 @@ describe('TypeDefinitionProvider', function () {`
`98`	`98`	`assert.deepStrictEqual(typeDefs, <Location[]>[`
`99`	`99`	`{`
`100`	`100`	`range: {`
`101`		`- end: { line: 1, character: 18 },`
`102`		`- start: { line: 1, character: 16 }`
	`101`	`+ end: { line: 0, character: 18 },`
	`102`	`+ start: { line: 0, character: 16 }`
`103`	`103`	`},`
`104`	`104`	`uri: getUri('../declaration-map/declaration-map-project/index.ts')`
`105`	`105`	`}`