Merge pull request #44 from MetabobProject/fix/highlight-processing

fix/highlight processing

Author: AviGopal

ext-src/commands/AnalyzeDocument.ts

@@ -21,14 +21,14 @@ export function activateAnalyzeCommand(context: vscode.ExtensionContext, _debug?
 
     // If the user has not opened any file then we can't perform any analysis.
     if (!editor) {
-      vscode.window.showErrorMessage(CONSTANTS.editorNotSelectorError);
       extensionEventEmitter.fire({
         type: 'Analysis_Error',
         data: 'Editor is undefined',
       });
       throw new Error('activateAnalyzeCommand: Editor is undefined');
     }
 
+    _debug?.appendLine('AnalyzeDocument.ts: activateAnalyzeCommand: editor.document: ' + JSON.stringify(editor.document));
     // If the user has not opened valid document i.e settings page or any other page
     // that is not a code file we will throw an error.
     if (!Util.isValidDocument(editor.document)) {
@@ -41,6 +41,7 @@ export function activateAnalyzeCommand(context: vscode.ExtensionContext, _debug?
       throw new Error('activateAnalyzeCommand: Selected Document is not valid');
     }
 
+    _debug?.appendLine('AnalyzeDocument.ts: activateAnalyzeCommand: Session Token: ' + sessionToken);
     // If the user session is not available then we can't request file analysis.
     if (!sessionToken) {
       vscode.window.showErrorMessage(CONSTANTS.sessionTokenUndefined);
@@ -52,6 +53,7 @@ export function activateAnalyzeCommand(context: vscode.ExtensionContext, _debug?
     }
 
     const documentMetaData = Util.extractMetaDataFromDocument(editor.document);
+    _debug?.appendLine('AnalyzeDocument.ts: activateAnalyzeCommand: documentMetaData: ' + JSON.stringify(documentMetaData));
 
     Util.withProgress<SubmitRepresentationResponse>(
       handleDocumentAnalyze(documentMetaData, sessionToken, analyzeState, context, undefined, true, _debug),

ext-src/helpers/HandleDocumentAnalyze.ts

@@ -181,6 +181,7 @@ export const handleDocumentAnalyze = async (
       results[key] = { ...analyzeMetaData };
     });
 
+  _debug?.appendLine('AnalyzeDocument.ts: Document File name' + documentMetaData.fileName);
   const problems = Util.getCurrentEditorProblems(results, documentMetaData.fileName);
   _debug?.appendLine('AnalyzeDocument.ts: handleDocumentAnalyze: problems: ' + JSON.stringify(problems));
   if (!problems) {
@@ -199,9 +200,9 @@ export const handleDocumentAnalyze = async (
     return failedResponseReturn;
   }
 
-  const path = problems.map(item => item.path);
+  const paths = problems.map(item => item.path);
 
-  const isUserOnValidEditor = path.includes(documentMetaData.fileName);
+  const isUserOnValidEditor = paths.includes(documentMetaData.fileName);
   _debug?.appendLine('AnalyzeDocument.ts: handleDocumentAnalyze: isUserOnValidEditor: ' + isUserOnValidEditor);
   if (isUserOnValidEditor) {
     Util.decorateCurrentEditorWithHighlights(problems, documentMetaData.editor, _debug);

ext-src/providers/recommendation.provider.ts

@@ -18,7 +18,7 @@ import {
 } from 'vscode';
 import { Configuration, CreateChatCompletionRequest, OpenAIApi } from 'openai';
 import { explainService, ExplainProblemPayload, SuggestRecomendationPayload } from '../services';
-import { CurrentQuestion, CurrentQuestionState, Session, Analyze, AnalyseMetaData } from '../state';
+import { CurrentQuestion, CurrentQuestionState, Session, Analyze } from '../state';
 import { BackendService, GetChatGPTToken } from '../config';
 import { DiscardCommandHandler, EndorseCommandHandler } from '../commands';
 import CONSTANTS from '../constants';

ext-src/utils.ts

@@ -70,8 +70,7 @@ export default class Utils {
     if (path === undefined) {
       return undefined
     }
-
-    const splitPath: string | undefined = path.split('/').pop()?.replace('.git', '');
+    const splitPath: string | undefined = path.split(/\/|\\/g).pop()?.replace('.git', '');
 
     if (splitPath === undefined) {
       return undefined
@@ -80,17 +79,11 @@ export default class Utils {
     return splitPath
   }
 
-  static getResource(rel: string): string {
-    return path
-      .resolve(this.context.extensionPath, rel.replace(/\//g, path.sep))
-      .replace(/\\/g, '/');
-  }
-
   static extractMetaDataFromDocument(document: vscode.TextDocument): IDocumentMetaData {
-    const filePath = document.uri.path;
+    const filePath = document.uri.fsPath;
     const workspaceFolder = workspace.getWorkspaceFolder(document.uri);
-    const relativePath = workspaceFolder ? path.relative(workspaceFolder.uri.path, filePath) : '';
-    const splitKey: string | undefined = relativePath.split('/').pop();
+    const relativePath = workspaceFolder ? path.relative(workspaceFolder.uri.fsPath, filePath) : '';
+    const splitKey: string | undefined = relativePath.split(/\/|\\/g).pop();
     const fileContent = document.getText();
     const isTextDocument = Utils.isTextDocument(document);
     const languageId = document.languageId;
@@ -200,6 +193,7 @@ export default class Utils {
     const currentEditor = vscode.window.activeTextEditor;
     if (!currentEditor) return false;
 
+    _debug?.appendLine('problem file <> Editor file: ' + problemEditor.document.fileName + ' <> ' + currentEditor.document.fileName);
     const isUserOnProblemEditor = problemEditor.document.fileName === currentEditor.document.fileName
 
     if (!isUserOnProblemEditor) return false;

package.json

@@ -2,7 +2,7 @@
   "name": "metabob",
   "displayName": "Metabob: Debug and Refactor with AI",
   "description": "Generative AI to automate debugging and refactoring Python code",
-  "version": "1.2.2",
+  "version": "1.2.5",
   "icon": "media/extension-icon.png",
   "repository": {
     "url": "https://github.com/MetabobProject/metabob-vscode",