Skip to content

Commit 1349eb0

Browse files
authored
fix: library pane crash with option symbolgen (#1098)
1 parent ba3a444 commit 1349eb0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

client/src/connection/itc/ItcLibraryAdapter.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class ItcLibraryAdapter implements LibraryAdapter {
5454
where libname='${item.library}' and memname='${item.name}'
5555
order by varnum;
5656
quit;
57-
%put <COLOUTPUT>; %put &OUTPUT; %put </COLOUTPUT>;
57+
%put <COLOUTPUT> &OUTPUT; %put </COLOUTPUT>;
5858
`;
5959

6060
const columnLines = processQueryRows(
@@ -87,7 +87,7 @@ class ItcLibraryAdapter implements LibraryAdapter {
8787
select catx(',', libname, readonly) as libname_target into: OUTPUT separated by '~'
8888
from sashelp.vlibnam order by libname asc;
8989
quit;
90-
%put <LIBOUTPUT>; %put &OUTPUT; %put </LIBOUTPUT>;
90+
%put <LIBOUTPUT> &OUTPUT; %put </LIBOUTPUT>;
9191
`;
9292

9393
const libNames = processQueryRows(
@@ -186,7 +186,7 @@ class ItcLibraryAdapter implements LibraryAdapter {
186186
where libname='${item.name!}'
187187
order by memname asc;
188188
quit;
189-
%put <TABLEOUTPUT>; %put &OUTPUT; %put </TABLEOUTPUT>;
189+
%put <TABLEOUTPUT> &OUTPUT; %put </TABLEOUTPUT>;
190190
`;
191191

192192
const tableNames = processQueryRows(
@@ -249,7 +249,7 @@ class ItcLibraryAdapter implements LibraryAdapter {
249249
const count = parseInt(countMatches[1].replace(/\s|\n/gm, ""), 10);
250250
output = output.replace(countRegex, "");
251251

252-
const rows = output.replace(/\n|\t/gm, "");
252+
const rows = output.replace(/\n|\t/gm, "").slice(output.indexOf("{"));
253253
try {
254254
const tableData = JSON.parse(rows);
255255
return { rows: tableData[`SASTableData+${tempTable}`], count };

client/src/connection/itc/script.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class SASRunner{
131131
try{
132132
$this.objSAS.LanguageService.FlushLogLines($chunkSize,$carriageControls,$lineTypes,$logLines)
133133
} catch{
134-
throw "FlushLog error"
134+
Write-Error "${ERROR_START_TAG}FlushLog error: $_${ERROR_END_TAG}"
135135
}
136136
for ($i = 0; $i -lt $logLines.Value.Length; $i++) {
137137
if (($carriageControls.Value[$i] -eq 1) -and $skipPageHeader) {

0 commit comments

Comments
 (0)