Merge pull request #643 from codestoryai/features/fix-reply-types

[ide] fix return types with byte offset

Author: theskcd

extensions/codestory/src/server/goToDefinition.ts

@@ -9,11 +9,11 @@ import { shouldTrackFile } from '../utilities/openTabs';
 
 export async function goToDefinition(request: SidecarGoToDefinitionRequest): Promise<SidecarGoToDefinitionResponse> {
 	const locations: vscode.LocationLink[] = await vscode.commands.executeCommand(
-		'vscode.executeTypeDefinitionProvider',
-		request.fs_file_path,
-		request.position
+		'vscode.executeDefinitionProvider',
+		vscode.Uri.file(request.fs_file_path),
+		new vscode.Position(request.position.line, request.position.character),
 	);
-	const definitons = await Promise.all(locations.map(async (location) => {
+	const definitions = await Promise.all(locations.map(async (location) => {
 		const uri = location.targetUri;
 		const range = location.targetRange;
 		// we have to always open the text document first, this ends up sending
@@ -33,16 +33,18 @@ export async function goToDefinition(request: SidecarGoToDefinitionRequest): Pro
 				startPosition: {
 					line: range.start.line,
 					character: range.start.character,
+					byteOffset: 0,
 				},
 				endPosition: {
 					line: range.end.line,
 					character: range.end.character,
+					byteOffset: 0,
 				}
 			},
 		};
 	}));
 	// lets return all of them over here
 	return {
-		symbols: definitons,
+		definitions,
 	};
 }

extensions/codestory/src/server/goToImplementation.ts

@@ -27,10 +27,12 @@ export async function goToImplementation(request: SidecarGoToImplementationReque
 				startPosition: {
 					line: range.start.line,
 					character: range.start.character,
+					byteOffset: 0,
 				},
 				endPosition: {
 					line: range.end.line,
 					character: range.end.character,
+					byteOffset: 0,
 				},
 			}
 		};

extensions/codestory/src/server/goToReferences.ts

@@ -26,10 +26,12 @@ export async function goToReferences(request: SidecarGoToReferencesRequest): Pro
 				startPosition: {
 					line: range.start.line,
 					character: range.start.character,
+					byteOffset: 0,
 				},
 				endPosition: {
 					line: range.end.line,
 					character: range.end.character,
+					byteOffset: 0,
 				},
 			}
 		};

extensions/codestory/src/server/requestHandler.ts

@@ -106,7 +106,7 @@ export async function handleRequest(req: http.IncomingMessage, res: http.ServerR
 		} else {
 			console.log('HC request');
 			res.writeHead(200, { 'Content-Type': 'application/json' });
-			res.end(JSON.stringify({ reply: 'gg' }));
+			res.end(JSON.stringify({ reply: 'gg_testing' }));
 		}
 	} catch (err) {
 		console.error(err);

extensions/codestory/src/server/types.ts

@@ -28,7 +28,7 @@ export type SidecarGoToDefinitionRequest = {
 };
 
 export type SidecarGoToDefinitionResponse = {
-	symbols: FileAndRange[];
+	definitions: FileAndRange[];
 };
 
 export type FileAndRange = {
@@ -37,10 +37,12 @@ export type FileAndRange = {
 		startPosition: {
 			line: number;
 			character: number;
+			byteOffset: number;
 		};
 		endPosition: {
 			line: number;
 			character: number;
+			byteOffset: number;
 		};
 	};
 };