Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tree-sitter for openSUSE:Factory checked in at 2025-01-02 19:19:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tree-sitter (Old) and /work/SRC/openSUSE:Factory/.tree-sitter.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tree-sitter" Thu Jan 2 19:19:29 2025 rev:18 rq:1234118 version:0.24.6 Changes: -------- --- /work/SRC/openSUSE:Factory/tree-sitter/tree-sitter.changes 2024-12-13 22:33:17.137430131 +0100 +++ /work/SRC/openSUSE:Factory/.tree-sitter.new.1881/tree-sitter.changes 2025-01-02 19:19:45.940363419 +0100 @@ -1,0 +2,6 @@ +Tue Dec 31 09:37:57 UTC 2024 - Richard Rahl <rra...@opensuse.org> + +- update to 0.24.6: + * playground: backport new playground + +------------------------------------------------------------------- Old: ---- tree-sitter-0.24.5.tar.gz New: ---- tree-sitter-0.24.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tree-sitter.spec ++++++ --- /var/tmp/diff_new_pack.SUVmIy/_old 2025-01-02 19:19:48.664475446 +0100 +++ /var/tmp/diff_new_pack.SUVmIy/_new 2025-01-02 19:19:48.680476104 +0100 @@ -18,7 +18,7 @@ %define somajor 0_24 Name: tree-sitter -Version: 0.24.5 +Version: 0.24.6 Release: 0 Summary: An incremental parsing system for programming tools License: GPL-2.0-only AND MIT ++++++ tree-sitter-0.24.5.tar.gz -> tree-sitter-0.24.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tree-sitter-0.24.5/Cargo.lock new/tree-sitter-0.24.6/Cargo.lock --- old/tree-sitter-0.24.5/Cargo.lock 2024-12-11 07:37:19.000000000 +0100 +++ new/tree-sitter-0.24.6/Cargo.lock 2024-12-27 04:25:48.000000000 +0100 @@ -1538,7 +1538,7 @@ [[package]] name = "tree-sitter" -version = "0.24.5" +version = "0.24.6" dependencies = [ "bindgen", "cc", @@ -1551,7 +1551,7 @@ [[package]] name = "tree-sitter-cli" -version = "0.24.5" +version = "0.24.6" dependencies = [ "anstyle", "anyhow", @@ -1601,7 +1601,7 @@ [[package]] name = "tree-sitter-config" -version = "0.24.5" +version = "0.24.6" dependencies = [ "anyhow", "dirs", @@ -1611,7 +1611,7 @@ [[package]] name = "tree-sitter-generate" -version = "0.24.5" +version = "0.24.6" dependencies = [ "anyhow", "heck 0.5.0", @@ -1632,7 +1632,7 @@ [[package]] name = "tree-sitter-highlight" -version = "0.24.5" +version = "0.24.6" dependencies = [ "lazy_static", "regex", @@ -1647,7 +1647,7 @@ [[package]] name = "tree-sitter-loader" -version = "0.24.5" +version = "0.24.6" dependencies = [ "anyhow", "cc", @@ -1671,7 +1671,7 @@ [[package]] name = "tree-sitter-tags" -version = "0.24.5" +version = "0.24.6" dependencies = [ "memchr", "regex", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tree-sitter-0.24.5/Cargo.toml new/tree-sitter-0.24.6/Cargo.toml --- old/tree-sitter-0.24.5/Cargo.toml 2024-12-11 07:37:19.000000000 +0100 +++ new/tree-sitter-0.24.6/Cargo.toml 2024-12-27 04:25:48.000000000 +0100 @@ -13,7 +13,7 @@ resolver = "2" [workspace.package] -version = "0.24.5" +version = "0.24.6" authors = ["Max Brunsfeld <maxbrunsf...@gmail.com>"] edition = "2021" rust-version = "1.74.1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tree-sitter-0.24.5/Makefile new/tree-sitter-0.24.6/Makefile --- old/tree-sitter-0.24.5/Makefile 2024-12-11 07:37:19.000000000 +0100 +++ new/tree-sitter-0.24.6/Makefile 2024-12-27 04:25:48.000000000 +0100 @@ -2,7 +2,7 @@ $(error Windows is not supported) endif -VERSION := 0.24.5 +VERSION := 0.24.6 DESCRIPTION := An incremental parsing system for programming tools HOMEPAGE_URL := https://tree-sitter.github.io/tree-sitter/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tree-sitter-0.24.5/build.zig.zon new/tree-sitter-0.24.6/build.zig.zon --- old/tree-sitter-0.24.5/build.zig.zon 2024-12-11 07:37:19.000000000 +0100 +++ new/tree-sitter-0.24.6/build.zig.zon 2024-12-27 04:25:48.000000000 +0100 @@ -1,6 +1,6 @@ .{ .name = "tree-sitter", - .version = "0.24.5", + .version = "0.24.6", .paths = .{ "build.zig", "build.zig.zon", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tree-sitter-0.24.5/cli/npm/package.json new/tree-sitter-0.24.6/cli/npm/package.json --- old/tree-sitter-0.24.5/cli/npm/package.json 2024-12-11 07:37:19.000000000 +0100 +++ new/tree-sitter-0.24.6/cli/npm/package.json 2024-12-27 04:25:48.000000000 +0100 @@ -1,6 +1,6 @@ { "name": "tree-sitter-cli", - "version": "0.24.5", + "version": "0.24.6", "author": "Max Brunsfeld", "license": "MIT", "repository": { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tree-sitter-0.24.5/cli/src/playground.html new/tree-sitter-0.24.6/cli/src/playground.html --- old/tree-sitter-0.24.5/cli/src/playground.html 2024-12-11 07:37:19.000000000 +0100 +++ new/tree-sitter-0.24.6/cli/src/playground.html 2024-12-27 04:25:48.000000000 +0100 @@ -20,6 +20,11 @@ </div> <div class=header-item> + <label for="anonymous-nodes-checkbox">show anonymous nodes</label> + <input id="anonymous-nodes-checkbox" type="checkbox"></input> + </div> + + <div class=header-item> <label for="query-checkbox">query</label> <input id="query-checkbox" type="checkbox"></input> </div> @@ -67,6 +72,12 @@ <script src=tree-sitter.js></script> <script src=playground.js></script> + <script> + setTimeout(() => { + window.initializePlayground({local: true}); + }, 1000); + </script> + <style> body { margin: 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tree-sitter-0.24.5/docs/assets/js/playground.js new/tree-sitter-0.24.6/docs/assets/js/playground.js --- old/tree-sitter-0.24.5/docs/assets/js/playground.js 2024-12-11 07:37:19.000000000 +0100 +++ new/tree-sitter-0.24.6/docs/assets/js/playground.js 2024-12-27 04:25:48.000000000 +0100 @@ -1,33 +1,116 @@ -let tree; +function initializeLocalTheme() { + const themeToggle = document.getElementById('theme-toggle'); + if (!themeToggle) return; + + // Load saved theme or use system preference + const savedTheme = localStorage.getItem('theme'); + const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches; + const initialTheme = savedTheme || (prefersDark ? 'dark' : 'light'); + + // Set initial theme + document.documentElement.setAttribute('data-theme', initialTheme); + + themeToggle.addEventListener('click', () => { + const currentTheme = document.documentElement.getAttribute('data-theme'); + const newTheme = currentTheme === 'light' ? 'dark' : 'light'; + document.documentElement.setAttribute('data-theme', newTheme); + localStorage.setItem('theme', newTheme); + }); +} + +function initializeCustomSelect({ initialValue = null, addListeners = false }) { + const button = document.getElementById('language-button'); + const select = document.getElementById('language-select'); + if (!button || !select) return; + + const dropdown = button.nextElementSibling; + const selectedValue = button.querySelector('.selected-value'); + + if (initialValue) { + select.value = initialValue; + } + selectedValue.textContent = select.options[select.selectedIndex].text; + + if (addListeners) { + button.addEventListener('click', (e) => { + e.preventDefault(); // Prevent form submission + dropdown.classList.toggle('show'); + }); + + document.addEventListener('click', (e) => { + if (!button.contains(e.target)) { + dropdown.classList.remove('show'); + } + }); + + dropdown.querySelectorAll('.option').forEach(option => { + option.addEventListener('click', () => { + selectedValue.textContent = option.textContent; + select.value = option.dataset.value; + dropdown.classList.remove('show'); -(async () => { - const CAPTURE_REGEX = /@\s*([\w._-]+)/g; - const COLORS_BY_INDEX = [ - 'blue', - 'chocolate', - 'darkblue', - 'darkcyan', - 'darkgreen', - 'darkred', - 'darkslategray', - 'dimgray', - 'green', - 'indigo', - 'navy', - 'red', - 'sienna', + const event = new Event('change'); + select.dispatchEvent(event); + }); + }); + } +} + +window.initializePlayground = async function initializePlayground(opts) { + const { local } = opts; + if (local) { + initializeLocalTheme(); + } + initializeCustomSelect({ addListeners: true }); + + let tree; + + const CAPTURE_REGEX = /@\s*([\w\._-]+)/g; + const LIGHT_COLORS = [ + "#0550ae", // blue + "#ab5000", // rust brown + "#116329", // forest green + "#844708", // warm brown + "#6639ba", // purple + "#7d4e00", // orange brown + "#0969da", // bright blue + "#1a7f37", // green + "#cf222e", // red + "#8250df", // violet + "#6e7781", // gray + "#953800", // dark orange + "#1b7c83" // teal + ]; + + const DARK_COLORS = [ + "#79c0ff", // light blue + "#ffa657", // orange + "#7ee787", // light green + "#ff7b72", // salmon + "#d2a8ff", // light purple + "#ffa198", // pink + "#a5d6ff", // pale blue + "#56d364", // bright green + "#ff9492", // light red + "#e0b8ff", // pale purple + "#9ca3af", // gray + "#ffb757", // yellow orange + "#80cbc4" // light teal ]; - const codeInput = document.getElementById('code-input'); - const languageSelect = document.getElementById('language-select'); - const loggingCheckbox = document.getElementById('logging-checkbox'); - const outputContainer = document.getElementById('output-container'); - const outputContainerScroll = document.getElementById('output-container-scroll'); - const playgroundContainer = document.getElementById('playground-container'); - const queryCheckbox = document.getElementById('query-checkbox'); - const queryContainer = document.getElementById('query-container'); - const queryInput = document.getElementById('query-input'); - const updateTimeSpan = document.getElementById('update-time'); + const codeInput = document.getElementById("code-input"); + const languageSelect = document.getElementById("language-select"); + const loggingCheckbox = document.getElementById("logging-checkbox"); + const anonymousNodes = document.getElementById('anonymous-nodes-checkbox'); + const outputContainer = document.getElementById("output-container"); + const outputContainerScroll = document.getElementById( + "output-container-scroll", + ); + const playgroundContainer = document.getElementById("playground-container"); + const queryCheckbox = document.getElementById("query-checkbox"); + const queryContainer = document.getElementById("query-container"); + const queryInput = document.getElementById("query-input"); + const updateTimeSpan = document.getElementById("update-time"); const languagesByName = {}; loadState(); @@ -35,21 +118,36 @@ await TreeSitter.init(); const parser = new TreeSitter(); + + console.log(parser, codeInput, queryInput); + const codeEditor = CodeMirror.fromTextArea(codeInput, { lineNumbers: true, showCursorWhenSelecting: true }); + codeEditor.on('keydown', (_, event) => { + if (event.key === 'ArrowLeft' || event.key === 'ArrowRight') { + event.stopPropagation(); // Prevent mdBook from going back/forward + } + }); + const queryEditor = CodeMirror.fromTextArea(queryInput, { lineNumbers: true, - showCursorWhenSelecting: true + showCursorWhenSelecting: true, + }); + + queryEditor.on('keydown', (_, event) => { + if (event.key === 'ArrowLeft' || event.key === 'ArrowRight') { + event.stopPropagation(); // Prevent mdBook from going back/forward + } }); const cluster = new Clusterize({ rows: [], noDataText: null, contentElem: outputContainer, - scrollElem: outputContainerScroll + scrollElem: outputContainerScroll, }); const renderTreeOnCodeChange = debounce(renderTree, 50); const saveStateOnChange = debounce(saveState, 2000); @@ -62,32 +160,33 @@ let isRendering = 0; let query; - codeEditor.on('changes', handleCodeChange); - codeEditor.on('viewportChange', runTreeQueryOnChange); - codeEditor.on('cursorActivity', debounce(handleCursorMovement, 150)); - queryEditor.on('changes', debounce(handleQueryChange, 150)); - - loggingCheckbox.addEventListener('change', handleLoggingChange); - queryCheckbox.addEventListener('change', handleQueryEnableChange); - languageSelect.addEventListener('change', handleLanguageChange); - outputContainer.addEventListener('click', handleTreeClick); + codeEditor.on("changes", handleCodeChange); + codeEditor.on("viewportChange", runTreeQueryOnChange); + codeEditor.on("cursorActivity", debounce(handleCursorMovement, 150)); + queryEditor.on("changes", debounce(handleQueryChange, 150)); + + loggingCheckbox.addEventListener("change", handleLoggingChange); + anonymousNodes.addEventListener('change', renderTree); + queryCheckbox.addEventListener("change", handleQueryEnableChange); + languageSelect.addEventListener("change", handleLanguageChange); + outputContainer.addEventListener("click", handleTreeClick); handleQueryEnableChange(); - await handleLanguageChange() + await handleLanguageChange(); - playgroundContainer.style.visibility = 'visible'; + playgroundContainer.style.visibility = "visible"; async function handleLanguageChange() { const newLanguageName = languageSelect.value; if (!languagesByName[newLanguageName]) { - const url = `${LANGUAGE_BASE_URL}/tree-sitter-${newLanguageName}.wasm` + const url = `${LANGUAGE_BASE_URL}/tree-sitter-${newLanguageName}.wasm`; languageSelect.disabled = true; try { languagesByName[newLanguageName] = await TreeSitter.Language.load(url); } catch (e) { console.error(e); languageSelect.value = languageName; - return + return; } finally { languageSelect.disabled = false; } @@ -100,8 +199,8 @@ handleQueryChange(); } - async function handleCodeChange(_editor, changes) { - const newText = `${codeEditor.getValue()}\n`; + async function handleCodeChange(editor, changes) { + const newText = codeEditor.getValue() + "\n"; const edits = tree && changes && changes.map(treeEditForEditorChange); const start = performance.now(); @@ -126,16 +225,16 @@ isRendering++; const cursor = tree.walk(); - const currentRenderCount = parseCount; - let row = ''; - const rows = []; + let currentRenderCount = parseCount; + let row = ""; + let rows = []; let finishedRow = false; let visitedChildren = false; let indentLevel = 0; - for (let i = 0;; i++) { + for (let i = 0; ; i++) { if (i > 0 && i % 10000 === 0) { - await new Promise(r => setTimeout(r, 0)); + await new Promise((r) => setTimeout(r, 0)); if (parseCount !== currentRenderCount) { cursor.delete(); isRendering--; @@ -145,9 +244,12 @@ let displayName; if (cursor.nodeIsMissing) { - displayName = `MISSING ${cursor.nodeType}` + const nodeTypeText = cursor.nodeIsNamed ? cursor.nodeType : `"${cursor.nodeType}"`; + displayName = `MISSING ${nodeTypeText}`; } else if (cursor.nodeIsNamed) { displayName = cursor.nodeType; + } else if (anonymousNodes.checked) { + displayName = cursor.nodeType } if (visitedChildren) { @@ -166,7 +268,7 @@ } else { if (displayName) { if (finishedRow) { - row += '</div>'; + row += "</div>"; rows.push(row); finishedRow = false; } @@ -175,11 +277,23 @@ const id = cursor.nodeId; let fieldName = cursor.currentFieldName; if (fieldName) { - fieldName += ': '; + fieldName += ": "; } else { - fieldName = ''; + fieldName = ""; } - row = `<div>${' '.repeat(indentLevel)}${fieldName}<a class='plain' href="#" data-id=${id} data-range="${start.row},${start.column},${end.row},${end.column}">${displayName}</a> [${start.row}, ${start.column}] - [${end.row}, ${end.column}]`; + + const nodeClass = + displayName === 'ERROR' || displayName.startsWith('MISSING') + ? 'node-link error' + : cursor.nodeIsNamed + ? 'node-link named' + : 'node-link anonymous'; + + row = `<div class="tree-row">${" ".repeat(indentLevel)}${fieldName}` + + `<a class='${nodeClass}' href="#" data-id=${id} ` + + `data-range="${start.row},${start.column},${end.row},${end.column}">` + + `${displayName}</a> <span class="position-info">` + + `[${start.row}, ${start.column}] - [${end.row}, ${end.column}]</span>`; finishedRow = true; } @@ -192,7 +306,7 @@ } } if (finishedRow) { - row += '</div>'; + row += "</div>"; rows.push(row); } @@ -212,33 +326,48 @@ codeEditor.operation(() => { const marks = codeEditor.getAllMarks(); - marks.forEach(m => m.clear()); + marks.forEach((m) => m.clear()); if (tree && query) { const captures = query.captures( tree.rootNode, - {row: startRow, column: 0}, - {row: endRow, column: 0}, + { row: startRow, column: 0 }, + { row: endRow, column: 0 }, ); let lastNodeId; - for (const {name, node} of captures) { + for (const { name, node } of captures) { if (node.id === lastNodeId) continue; lastNodeId = node.id; - const {startPosition, endPosition} = node; + const { startPosition, endPosition } = node; codeEditor.markText( - {line: startPosition.row, ch: startPosition.column}, - {line: endPosition.row, ch: endPosition.column}, + { line: startPosition.row, ch: startPosition.column }, + { line: endPosition.row, ch: endPosition.column }, { inclusiveLeft: true, inclusiveRight: true, - css: `color: ${colorForCaptureName(name)}` - } + css: `color: ${colorForCaptureName(name)}`, + }, ); } } }); } + // When we change from a dark theme to a light theme (and vice versa), the colors of the + // captures need to be updated. + const observer = new MutationObserver((mutations) => { + mutations.forEach((mutation) => { + if (mutation.attributeName === 'class') { + handleQueryChange(); + } + }); + }); + + observer.observe(document.documentElement, { + attributes: true, + attributeFilter: ['class'] + }); + function handleQueryChange() { if (query) { query.delete(); @@ -247,7 +376,7 @@ } queryEditor.operation(() => { - queryEditor.getAllMarks().forEach(m => m.clear()); + queryEditor.getAllMarks().forEach((m) => m.clear()); if (!queryCheckbox.checked) return; const queryText = queryEditor.getValue(); @@ -258,15 +387,15 @@ let row = 0; queryEditor.eachLine((line) => { - while (match = CAPTURE_REGEX.exec(line.text)) { + while ((match = CAPTURE_REGEX.exec(line.text))) { queryEditor.markText( - {line: row, ch: match.index}, - {line: row, ch: match.index + match[0].length}, + { line: row, ch: match.index }, + { line: row, ch: match.index + match[0].length }, { inclusiveLeft: true, inclusiveRight: true, - css: `color: ${colorForCaptureName(match[1])}` - } + css: `color: ${colorForCaptureName(match[1])}`, + }, ); } row++; @@ -275,7 +404,7 @@ const startPosition = queryEditor.posFromIndex(error.index); const endPosition = { line: startPosition.line, - ch: startPosition.ch + (error.length || Infinity) + ch: startPosition.ch + (error.length || Infinity), }; if (error.index === queryText.length) { @@ -287,16 +416,12 @@ } } - queryEditor.markText( - startPosition, - endPosition, - { - className: 'query-error', - inclusiveLeft: true, - inclusiveRight: true, - attributes: {title: error.message} - } - ); + queryEditor.markText(startPosition, endPosition, { + className: "query-error", + inclusiveLeft: true, + inclusiveRight: true, + attributes: { title: error.message }, + }); } }); @@ -308,16 +433,13 @@ if (isRendering) return; const selection = codeEditor.getDoc().listSelections()[0]; - let start = {row: selection.anchor.line, column: selection.anchor.ch}; - let end = {row: selection.head.line, column: selection.head.ch}; + let start = { row: selection.anchor.line, column: selection.anchor.ch }; + let end = { row: selection.head.line, column: selection.head.ch }; if ( start.row > end.row || - ( - start.row === end.row && - start.column > end.column - ) + (start.row === end.row && start.column > end.column) ) { - const swap = end; + let swap = end; end = start; start = swap; } @@ -325,12 +447,22 @@ if (treeRows) { if (treeRowHighlightedIndex !== -1) { const row = treeRows[treeRowHighlightedIndex]; - if (row) treeRows[treeRowHighlightedIndex] = row.replace('highlighted', 'plain'); + if (row) + treeRows[treeRowHighlightedIndex] = row.replace( + "highlighted", + "plain", + ); } - treeRowHighlightedIndex = treeRows.findIndex(row => row.includes(`data-id=${node.id}`)); + treeRowHighlightedIndex = treeRows.findIndex((row) => + row.includes(`data-id=${node.id}`), + ); if (treeRowHighlightedIndex !== -1) { const row = treeRows[treeRowHighlightedIndex]; - if (row) treeRows[treeRowHighlightedIndex] = row.replace('plain', 'highlighted'); + if (row) + treeRows[treeRowHighlightedIndex] = row.replace( + "plain", + "highlighted", + ); } cluster.update(treeRows); const lineHeight = cluster.options.item_height; @@ -338,26 +470,25 @@ const containerHeight = outputContainerScroll.clientHeight; const offset = treeRowHighlightedIndex * lineHeight; if (scrollTop > offset - 20) { - $(outputContainerScroll).animate({scrollTop: offset - 20}, 150); + $(outputContainerScroll).animate({ scrollTop: offset - 20 }, 150); } else if (scrollTop < offset + lineHeight + 40 - containerHeight) { - $(outputContainerScroll).animate({scrollTop: offset - containerHeight + 40}, 150); + $(outputContainerScroll).animate( + { scrollTop: offset - containerHeight + 40 }, + 150, + ); } } } function handleTreeClick(event) { - if (event.target.tagName === 'A') { + if (event.target.tagName === "A") { event.preventDefault(); - const [startRow, startColumn, endRow, endColumn] = event - .target - .dataset - .range - .split(',') - .map(n => parseInt(n)); + const [startRow, startColumn, endRow, endColumn] = + event.target.dataset.range.split(",").map((n) => parseInt(n)); codeEditor.focus(); codeEditor.setSelection( - {line: startRow, ch: startColumn}, - {line: endRow, ch: endColumn} + { line: startRow, ch: startColumn }, + { line: endRow, ch: endColumn }, ); } } @@ -366,9 +497,9 @@ if (loggingCheckbox.checked) { parser.setLogger((message, lexing) => { if (lexing) { - console.log(" ", message) + console.log(" ", message); } else { - console.log(message) + console.log(message); } }); } else { @@ -378,11 +509,11 @@ function handleQueryEnableChange() { if (queryCheckbox.checked) { - queryContainer.style.visibility = ''; - queryContainer.style.position = ''; + queryContainer.style.visibility = ""; + queryContainer.style.position = ""; } else { - queryContainer.style.visibility = 'hidden'; - queryContainer.style.position = 'absolute'; + queryContainer.style.visibility = "hidden"; + queryContainer.style.position = "absolute"; } handleQueryChange(); } @@ -392,48 +523,63 @@ const newLineCount = change.text.length; const lastLineLength = change.text[newLineCount - 1].length; - const startPosition = {row: change.from.line, column: change.from.ch}; - const oldEndPosition = {row: change.to.line, column: change.to.ch}; + const startPosition = { row: change.from.line, column: change.from.ch }; + const oldEndPosition = { row: change.to.line, column: change.to.ch }; const newEndPosition = { row: startPosition.row + newLineCount - 1, - column: newLineCount === 1 - ? startPosition.column + lastLineLength - : lastLineLength + column: + newLineCount === 1 + ? startPosition.column + lastLineLength + : lastLineLength, }; const startIndex = codeEditor.indexFromPos(change.from); let newEndIndex = startIndex + newLineCount - 1; let oldEndIndex = startIndex + oldLineCount - 1; for (let i = 0; i < newLineCount; i++) newEndIndex += change.text[i].length; - for (let i = 0; i < oldLineCount; i++) oldEndIndex += change.removed[i].length; + for (let i = 0; i < oldLineCount; i++) + oldEndIndex += change.removed[i].length; return { - startIndex, oldEndIndex, newEndIndex, - startPosition, oldEndPosition, newEndPosition + startIndex, + oldEndIndex, + newEndIndex, + startPosition, + oldEndPosition, + newEndPosition, }; } function colorForCaptureName(capture) { const id = query.captureNames.indexOf(capture); - return COLORS_BY_INDEX[id % COLORS_BY_INDEX.length]; + const isDark = document.querySelector('html').classList.contains('ayu') || + document.querySelector('html').classList.contains('coal') || + document.querySelector('html').classList.contains('navy'); + + const colors = isDark ? DARK_COLORS : LIGHT_COLORS; + return colors[id % colors.length]; } function loadState() { const language = localStorage.getItem("language"); const sourceCode = localStorage.getItem("sourceCode"); + const anonNodes = localStorage.getItem("anonymousNodes"); const query = localStorage.getItem("query"); const queryEnabled = localStorage.getItem("queryEnabled"); if (language != null && sourceCode != null && query != null) { queryInput.value = query; codeInput.value = sourceCode; languageSelect.value = language; - queryCheckbox.checked = (queryEnabled === 'true'); + initializeCustomSelect({ initialValue: language }); + anonymousNodes.checked = anonNodes === "true"; + queryCheckbox.checked = queryEnabled === "true"; } } function saveState() { localStorage.setItem("language", languageSelect.value); localStorage.setItem("sourceCode", codeEditor.getValue()); + localStorage.setItem("anonymousNodes", anonymousNodes.checked); saveQueryState(); } @@ -443,17 +589,18 @@ } function debounce(func, wait, immediate) { - let timeout; - return function() { - const context = this, args = arguments; - const later = function() { + var timeout; + return function () { + var context = this, + args = arguments; + var later = function () { timeout = null; if (!immediate) func.apply(context, args); }; - const callNow = immediate && !timeout; + var callNow = immediate && !timeout; clearTimeout(timeout); timeout = setTimeout(later, wait); if (callNow) func.apply(context, args); }; } -})(); +}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tree-sitter-0.24.5/lib/CMakeLists.txt new/tree-sitter-0.24.6/lib/CMakeLists.txt --- old/tree-sitter-0.24.5/lib/CMakeLists.txt 2024-12-11 07:37:19.000000000 +0100 +++ new/tree-sitter-0.24.6/lib/CMakeLists.txt 2024-12-27 04:25:48.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.13) project(tree-sitter - VERSION "0.24.5" + VERSION "0.24.6" DESCRIPTION "An incremental parsing system for programming tools" HOMEPAGE_URL "https://tree-sitter.github.io/tree-sitter/"; LANGUAGES C) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tree-sitter-0.24.5/lib/binding_web/package.json new/tree-sitter-0.24.6/lib/binding_web/package.json --- old/tree-sitter-0.24.5/lib/binding_web/package.json 2024-12-11 07:37:19.000000000 +0100 +++ new/tree-sitter-0.24.6/lib/binding_web/package.json 2024-12-27 04:25:48.000000000 +0100 @@ -1,6 +1,6 @@ { "name": "web-tree-sitter", - "version": "0.24.5", + "version": "0.24.6", "description": "Tree-sitter bindings for the web", "main": "tree-sitter.js", "types": "tree-sitter-web.d.ts", ++++++ vendor.tar.zst ++++++ /work/SRC/openSUSE:Factory/tree-sitter/vendor.tar.zst /work/SRC/openSUSE:Factory/.tree-sitter.new.1881/vendor.tar.zst differ: char 7, line 1
