clipboard preview leading tab trimming while preserving indentation + proper width calculations
Python / lint-format (pull_request) Successful in 27s
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 30s
Python / test (pull_request) Successful in 32s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m6s

This commit is contained in:
2026-06-15 18:23:56 +02:00
parent 2034f3a8db
commit 578a10c950
7 changed files with 136 additions and 135 deletions
+30 -114
View File
@@ -20,10 +20,8 @@ Singleton {
}))
property string previewImageFile: "/tmp/qs-cliphist-preview.img"
property string previewImageSource: ""
property bool previewIsCode: looksLikeCode(previewText)
property bool previewIsImage: false
readonly property string previewMarkup: previewIsCode ? generateHighlightedMarkup(previewText) : previewText
property string previewText: ""
property list<var> previewText: []
property int previewToken: 0
property real scoreThreshold: 0.2
@@ -59,119 +57,37 @@ Singleton {
});
}
function generateHighlightedMarkup(text): string {
const raw = String(text ?? "");
const lines = raw.split("\n").map(line => highlightCodeLine(line));
return `<div style="font-family:monospace; white-space:pre-wrap;">${lines.join("<br>")}</div>`;
}
function highlightCodeLine(rawLine): string {
const line = String(rawLine ?? "");
const kwColor = DynamicColors.palette.m3primary;
const strColor = DynamicColors.palette.m3tertiary;
const comColor = Qt.alpha(DynamicColors.palette.m3onSurface, 0.55);
const keywordRe = /\b(function|class|import|const|let|var|if|else|for|while|return|switch|case|break|continue|try|catch|throw|async|await|new|null|true|false|public|private|protected|static|extends|struct|enum)\b/g;
let out = "";
let i = 0;
while (i < line.length) {
const ch = line[i];
// Line comment
if (line.slice(i, i + 2) === "//") {
out += `<span style="color:${comColor};">${escapeHtml(line.slice(i))}</span>`;
break;
}
// Shell/Python-style comment
if (ch === "#" && i === 0) {
out += `<span style="color:${comColor};">${escapeHtml(line.slice(i))}</span>`;
break;
}
// Quoted string
if (ch === "'" || ch === '"' || ch === "`") {
const quote = ch;
let j = i + 1;
while (j < line.length) {
if (line[j] === "\\") {
j += 2;
continue;
}
if (line[j] === quote) {
j += 1;
break;
}
j += 1;
}
out += `<span style="color:${strColor};">${escapeHtml(line.slice(i, j))}</span>`;
i = j;
continue;
}
// Plain code text until next special token
let j = i;
while (j < line.length) {
const two = line.slice(j, j + 2);
const c = line[j];
if (two === "//")
break;
if (c === "'" || c === '"' || c === "`")
break;
if (c === "#" && j === 0)
break;
j += 1;
}
let segment = escapeHtml(line.slice(i, j));
segment = segment.replace(keywordRe, `<span style="color:${kwColor}; font-weight:600;">$1</span>`);
out += segment;
i = j;
}
return out === "" ? "&nbsp;" : out;
}
function looksLikeCode(text): bool {
const t = String(text ?? "").trim();
if (t === "")
return false;
const lines = t.split("\n");
if (lines.length < 2)
return false;
let score = 0;
for (const line of lines) {
if (/^\s{4,}|\t/.test(line))
score += 2;
if (/[{}()[\];]/.test(line))
score += 1;
if (/\b(function|class|import|const|let|var|if|else|for|while|return|switch|case|try|catch|async|await)\b/.test(line))
score += 2;
if (/=>|:=/.test(line))
score += 1;
}
return score >= 4;
}
function paste(entry): void {
Quickshell.execDetached(["bash", "-c", `printf '${shellSingleQuoteEscape(entry)}' | ${root.cliphistBinary} decode | wl-copy && wl-paste`]);
}
function processPreviewLines(text: string): var {
if (text === "")
return [];
const lines = text.split("\n");
let minIndent = Infinity;
for (let i = 0; i < lines.length; i++) {
const m = lines[i].match(/^(\s*)/);
const indent = m ? m[1].length : 0;
if (lines[i].trim().length > 0 && indent < minIndent)
minIndent = indent;
}
if (minIndent === Infinity)
minIndent = 0;
const result = [];
for (let i = 0; i < lines.length; i++) {
const line = lines[i];
const indentMatch = line.match(/^(\s*)/);
const indentLen = indentMatch ? indentMatch[1].length : 0;
const stripped = line.slice(Math.min(minIndent, indentLen));
result.push({
line: i + 1,
text: stripped
});
}
return result;
}
function refresh(): void {
readProc.buffer = [];
readProc.running = true;
@@ -182,7 +98,7 @@ Singleton {
const token = previewToken;
if (!currentEntry) {
previewText = "";
previewText = [];
previewImageSource = "";
previewIsImage = false;
return;
@@ -269,7 +185,7 @@ Singleton {
onStreamFinished: {
if (previewTextProc.token !== root.previewToken)
return;
root.previewText = this.text;
root.previewText = root.processPreviewLines(this.text);
}
}
}