fix: file path parsing in sany output

tlaplus · Aug 27, 2024 · c497f6e · c497f6e
1 parent 0cce9ac
commit c497f6e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -47,10 +47,6 @@
     ],
     "main": "./out/main.js",
     "browser": "./out/main.browser.js",
-    "files": [
-        "resources",
-        "tools"
-    ],
     "contributes": {
         "terminal": {
             "profiles": [

diff --git a/src/parsers/sany.ts b/src/parsers/sany.ts
@@ -248,7 +248,7 @@ export class SanyStdoutParser extends ProcessOutputHandler<SanyData> {
     }
 
     private tryParseModulePath(line: string) {
-        const rxJarPath = /^(.*)(?: \(jar:file:.*\))$/g;
+        const rxJarPath = /^(.*)(?: \(.*\))$/g;
         const jarPathMatches = rxJarPath.exec(line);
         const modPath = jarPathMatches ? jarPathMatches[1] : line;
         this.rememberParsedModule(modPath);

diff --git a/src/webview/checkResultView/common.tsx b/src/webview/checkResultView/common.tsx
@@ -7,13 +7,15 @@ export const EmptyLine = () => <div style={{marginTop: '1em'}}/>;
 
 interface CodeRangeLinkI {line: string, filepath: string | undefined, range: Range}
 export const CodeRangeLink = React.memo(({line, filepath, range}: CodeRangeLinkI) => (
-    (!filepath || !range) ? (null) : <CodePositionLink line={line} filepath={filepath} position={range[0]}/>
+    (!filepath || !range)
+        ? <>{line}</>
+        : <CodePositionLink line={line} filepath={filepath} position={range[0]}/>
 ));
 
 interface CodePositionLinkI {line: string, filepath: string | undefined, position: Position | undefined}
 export const CodePositionLink = React.memo(({line, filepath, position}: CodePositionLinkI) => {
     if (!filepath || !position) {
-        return (null);
+        return (<>{line}</>);
     }
 
     const location = {'line': position.line, 'character': position.character};