Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 16 additions & 23 deletions media/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,6 @@
window.addEventListener('message', event => {
const message = event.data; // The json data that the extension sent
switch (message.type) {
case 'highlight':
// console.log('Got', message.html, 'for', message.indx);
window.inbox[message.indx].goal_text_highlighted = message.html;
break;
case 'highlight_elided':
// console.log('Got', message.html, 'for', message.indx);
window.inbox[message.indx].goal_text_highlighted_elided = message.html;
break;
case 'highlight_inline':
$('#' + message.id).html(message.html);
break;
case 'trace':
clear();
trace(message.trace);
Expand Down Expand Up @@ -648,7 +637,7 @@ ${step.value.findall_solution_text}
</span>
</div>
<div id="${rule_id}" class="is-collapsible rule-inline">
<pre class="shiki" style="background-color: var(--shiki-color-background)"><span class="line"><span style="color: var(--shiki-color-text)">${step.value.suspend_sibling.goal_text}</span></span></pre>
${format_highlight_box(step.value.suspend_sibling.goal_text)}
</div>
</div>
<div class="panel-element panel-element-footer"></div>
Expand Down Expand Up @@ -697,7 +686,7 @@ ${step.value.findall_solution_text}
</span>
</div>
<div id="${rule_id}" class="is-collapsible rule-inline">
<pre class="shiki" style="background-color: var(--shiki-color-background)"><span class="line"><span style="color: var(--shiki-color-text)">${step.value[i].goal_text}</span></span></pre>
${format_highlight_box(step.value[i].goal_text)}
</div>
`;
}
Expand Down Expand Up @@ -1057,7 +1046,7 @@ class="has-tooltip-arrow has-tooltip-bottom" data-tooltip="${rule_loc_file} (${r

</div>
<div id="${rule_id}" class="is-collapsible rule-inline">
<pre class="shiki" style="background-color: var(--shiki-color-background)"><span style="color: var(--shiki-color-text)">${rule_text_full}</span></pre>
${format_highlight_box(rule_text_full)}
</div>`;

return fmt;
Expand Down Expand Up @@ -1088,7 +1077,7 @@ class="has-tooltip-arrow has-tooltip-bottom" data-tooltip="${rule_loc_file} (${r
</span>
</div>
<div id="${rule_id}" class="is-collapsible rule-inline">
<pre class="shiki" style="background-color: var(--shiki-color-background)"><span class="line"><span style="color: var(--shiki-color-text)">${element[i].value}</span></span></pre>
${format_highlight_box(element[i].value)}
</div>`;

}
Expand Down Expand Up @@ -1138,7 +1127,7 @@ class="has-tooltip-arrow has-tooltip-bottom" data-tooltip="${rule_loc_file} (${r
</span>
</div>
<div id="${rule_id}" class="is-collapsible rule-inline">
<pre class="shiki" style="background-color: var(--shiki-color-background)"><span class="line"><span style="color: var(--shiki-color-text)">${element[i].goal_text}</span></span></pre>
${format_highlight_box(element[i].goal_text)}
</div>`;
} else {

Expand All @@ -1154,7 +1143,7 @@ class="has-tooltip-arrow has-tooltip-bottom" data-tooltip="${rule_loc_file} (${r
</span>
</div>
<div id="${rule_id}" class="is-collapsible rule-inline">
<pre class="shiki" style="background-color: var(--shiki-color-background)"><span class="line"><span style="color: var(--shiki-color-text)">${element[i].goal_text}</span></span></pre>
${format_highlight_box(element[i].goal_text)}
</div>`;
}

Expand Down Expand Up @@ -1197,7 +1186,7 @@ class="has-tooltip-arrow has-tooltip-bottom" data-tooltip="${attempt_loc_file} (
<span>${elide(20, attempt_text)}</span>
</div>
<div id="${rule_id}" class="is-collapsible rule-inline">
<pre class="shiki" style="background-color: var(--shiki-color-background)"><span class="line"><span style="color: var(--shiki-color-text)">${attempt_text}</span></span></pre>
${format_highlight_box(attempt_text)}
</div>`;

return fmt;
Expand Down Expand Up @@ -1244,7 +1233,7 @@ class="has-tooltip-arrow has-tooltip-bottom" data-tooltip="${attempt_loc_file} (
</span>
</div>
<div id="${rule_id}" class="is-collapsible rule-inline">
<pre class="shiki" style="background-color: var(--shiki-color-background)"><span class="line"><span style="color: var(--shiki-color-text)">${element.chr_new_goals[i].goal_text}</span></span></pre>
${format_highlight_box(element.chr_new_goals[i].goal_text)}
</div>
`;

Expand Down Expand Up @@ -1285,7 +1274,7 @@ class="has-tooltip-arrow has-tooltip-bottom" data-tooltip="${attempt_loc_file} (
</span>
</div>
<div id="${rule_id}" class="is-collapsible rule-inline">
<pre class="shiki" style="background-color: var(--shiki-color-background)"><span class="line"><span style="color: var(--shiki-color-text)">${element[i].goal_text}</span></span></pre>
${format_highlight_box(element[i].goal_text)}
</div>
`;

Expand Down Expand Up @@ -1333,7 +1322,7 @@ class="has-tooltip-arrow has-tooltip-bottom" data-tooltip="${attempt_loc_file} (
</span>
</div>
<div id="${rule_id}" class="is-collapsible rule-inline">
<pre class="shiki" style="background-color: var(--shiki-color-background)"><span class="line"><span style="color: var(--shiki-color-text)">${element[i].goal_text}</span></span></pre>
${format_highlight_box(element[i].goal_text)}
</div>
`;

Expand All @@ -1348,6 +1337,10 @@ class="has-tooltip-arrow has-tooltip-bottom" data-tooltip="${attempt_loc_file} (
return fmt;
}

function format_highlight_box(text) {
return `<pre class="shiki" style="background-color: var(--shiki-color-background)"><span class="line"><span style="color: var(--shiki-color-text)">${text}</span></span></pre>`
}

// /////////////////////////////////////////////////////////////////////////////
//
// /////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -1652,9 +1645,9 @@ class="has-tooltip-arrow has-tooltip-bottom" data-tooltip="${attempt_loc_file} (

window.inbox[i].goal_text_elided = elide(25, window.inbox[i].goal_text);

window.inbox[i].goal_text_highlighted = '<pre class="shiki" style="background-color: var(--shiki-color-background)"><span class="line"><span style="color: var(--shiki-color-text)">' + window.inbox[i].goal_text + '</span></span></pre>';
window.inbox[i].goal_text_highlighted = format_highlight_box(window.inbox[i].goal_text)

window.inbox[i].goal_text_highlighted_elided = '<pre class="shiki" style="background-color: var(--shiki-color-background)"><span class="line"><span style="color: var(--shiki-color-text)">' + window.inbox[i].goal_text_elided + '</span></span></pre>';
window.inbox[i].goal_text_highlighted_elided = format_highlight_box(window.inbox[i].goal_text_elided)

// /////////////////////////////////////////////////////////////////////////////
}
Expand Down
60 changes: 0 additions & 60 deletions src/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,6 @@ export class TraceProvider implements vscode.WebviewViewProvider {

this._channel.appendLine("Running extension for " + os.platform() + " - " + os.release());

let elpi_lang_grammar_path = vscode.Uri.joinPath(this._extensionUri, 'syntaxes', 'elpi.tmLanguage.json').path;

if (os.platform().toString().toLowerCase() == "win32")
elpi_lang_grammar_path = elpi_lang_grammar_path.slice(1);

this._channel.appendLine("Loading grammar file " + elpi_lang_grammar_path);

const elpi_lang_grammer = JSON.parse(fs.readFileSync(elpi_lang_grammar_path, 'utf8'));
const elpi_lang = {
id: "elpi",
scopeName: 'source.elpi',
grammar: elpi_lang_grammer
};

this._elpi = "";
this._elpi_trace_elaborator = "";

Expand Down Expand Up @@ -116,52 +102,6 @@ export class TraceProvider implements vscode.WebviewViewProvider {

webviewView.webview.onDidReceiveMessage(message => {
switch (message.command) {

case 'highlight':
{
const code = message.value;
const indx = message.index;
let html = undefined;

if (this._view)
this._view.webview.postMessage({
type: 'highlight',
html: html,
indx: indx
});

break;
}
case 'highlight_elided':
{
const code = message.value;
const indx = message.index;
let html = undefined;

if (this._view)
this._view.webview.postMessage({
type: 'highlight_elided',
html: html,
indx: indx
});

break;
}
case 'highlight_inline':
{
const code = message.value;
const id = message.id;
let html = undefined;

if (this._view)
this._view.webview.postMessage({
type: 'highlight_inline',
html: html,
id: id
});

break;
}
case 'notify':
{
vscode.window.showInformationMessage(message.value);
Expand Down
Loading