Skip to content

fix(extension): stabilize update marker #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iFwu wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(extension): stabilize update marker #332

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
339e093
fix(extension): Stabilize update marker
Apr 28, 2026
e0891fe
fix(extension): Preserve marker wording
Apr 28, 2026
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
14 changes: 11 additions & 3 deletions extension/src/fetch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@ import { window, workspace } from 'vscode'
import { getConfig } from './config'
import { FILE, MSG_PREFIX, URL_PREFIX } from './constants'

const UPDATE_MARKER_FALLBACK = 'Last update from upstream'

export async function fetchLatest() {
const repo = getConfig<string>('fileNestingUpdater.upstreamRepo')
const branch = getConfig<string>('fileNestingUpdater.upstreamBranch')
const url = `${URL_PREFIX}/${repo}@${branch}/${FILE}`
const md = await fetch(url).then(r => r.text())
const content = (md.match(/```jsonc([\s\S]*?)```/) || [])[1] || ''
const updated = content.match(/^\s*\/\/ updated (.+)$/m)?.[1]?.trim()

const json = `{${
content
Expand All @@ -21,12 +24,15 @@ export async function fetchLatest() {
}}`

const config = JSON.parse(json) || {}
return config['explorer.fileNesting.patterns']
return {
patterns: config['explorer.fileNesting.patterns'],
updated,
}
}

export async function fetchAndUpdate(ctx: ExtensionContext, prompt = true) {
const config = workspace.getConfiguration()
const patterns = await fetchLatest()
const { patterns, updated } = await fetchLatest()
let shouldUpdate = true

const oringalPatterns = { ...(config.get<object>('explorer.fileNesting.patterns') || {}) }
Expand Down Expand Up @@ -54,7 +60,9 @@ export async function fetchAndUpdate(ctx: ExtensionContext, prompt = true) {
config.update('explorer.fileNesting.expand', false, true)

config.update('explorer.fileNesting.patterns', {
'//': `Last update at ${new Date().toLocaleString()}`,
'//': updated
? `Last update at ${updated} UTC`
: UPDATE_MARKER_FALLBACK,
...patterns,
}, true)

Expand Down