From 1576493862b1a7120c798699e111a38f5b09a6c0 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 9 Oct 2024 17:50:44 +0200
Subject: [PATCH] extract relative path

---
 apps/vyper/src/app/app.tsx        |  8 +++++---
 apps/vyper/src/app/utils/index.ts | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/apps/vyper/src/app/app.tsx b/apps/vyper/src/app/app.tsx
index a4dfc44b70..915cfd35bc 100644
--- a/apps/vyper/src/app/app.tsx
+++ b/apps/vyper/src/app/app.tsx
@@ -1,7 +1,7 @@
 import { useState, useEffect, useRef } from 'react'
 import { IntlProvider } from 'react-intl'
 import { Renderer } from '@remix-ui/renderer'
-import { remixClient } from './utils'
+import { remixClient, extractRelativePath } from './utils'
 import { CompilationResult } from '@remixproject/plugin-api'
 
 // Components
@@ -173,7 +173,7 @@ const App = () => {
         <div className="px-3 w-100 mb-3 mt-1" id="compile-btn">
           <CompilerButton compilerUrl={compilerUrl()} contract={contract} setOutput={(name, update) => setOutput({ ...output, [name]: update })} resetCompilerState={resetCompilerResultState} output={output} remixClient={remixClient}/>
         </div>
-        <article id="result" className="px-3 p-2 mx-3 border-top mt-2">
+        <article id="result" className="px-3 p-2 mx-3 border-top mt-2 vyper-errorBlobs">
           {output && output.status === 'success' && 
             <>
               <VyperResult output={output} plugin={remixClient} />
@@ -181,8 +181,10 @@ const App = () => {
           }
           {output && output.status === 'failed' &&
             output.errors && output.errors.map((error: VyperCompilationError, index: number) => {
+              // we need to tweak the path to not show the filesystem absolute error.
+              
               return <Renderer key={index}
-                  message={error.message}
+                  message={extractRelativePath(error.message, contract)}
                   plugin={remixClient}
                   opt={{
                     useSpan: false,
diff --git a/apps/vyper/src/app/utils/index.ts b/apps/vyper/src/app/utils/index.ts
index cb094b5d7b..4447fab9a7 100644
--- a/apps/vyper/src/app/utils/index.ts
+++ b/apps/vyper/src/app/utils/index.ts
@@ -9,4 +9,21 @@ export function contractName(fileName: string): string {
 export function isVyper(name: string): boolean {
   const parts = name.split('.')
   return parts[parts.length - 1] === 'vy'
+}
+
+export function extractRelativePath(content: string, filePath: string): string {
+  try {
+    const regex = /(\/.*?\S*)/g
+    const paths = content.match(regex)
+    if (paths) {
+      for (const absPath of paths) {
+        if (absPath.indexOf(filePath) !== -1) {
+          content = content.replace(absPath, filePath)
+        }
+      }
+    }
+  } catch (e) {
+    console.error(e)
+  }
+  return content
 }
\ No newline at end of file