Skip to content
Merged
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
35 changes: 24 additions & 11 deletions src/renderer/components/editor/Editor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,11 @@ async function init() {
copy()
})

watch(selectedSnippetContent, (v) => {
watch(selectedSnippetContent, (v, oldV) => {
nextTick(() => {
setValue(v?.value || '')
const isNewValue = v?.id !== oldV?.id
// Не сохраняем вьюпорт при смене фрагмента/сниппета
setValue(v?.value || '', true, !isNewValue)
nextTick(() => {
if (searchQuery.value) {
updateSearchOverlay()
Expand Down Expand Up @@ -261,21 +263,32 @@ async function init() {
})
}

function setValue(value: string, programmatic = true) {
function setValue(value: string, programmatic = true, preserveViewport = true) {
if (!editor)
return

const cursor = editor.getCursor()
const current = editor.getValue()
if (current === value)
return

isProgrammaticChange.value = programmatic
editor?.setValue(value)
const cursor = preserveViewport ? editor.getCursor() : null
const { left, top } = preserveViewport
? editor.getScrollInfo()
: { left: 0, top: 0 }

nextTick(() => {
isProgrammaticChange.value = false
})
isProgrammaticChange.value = programmatic
editor.setValue(value)
isProgrammaticChange.value = false

if (cursor)
editor.setCursor(cursor)
if (preserveViewport) {
if (cursor)
editor.setCursor(cursor)
editor.scrollTo(left, top)
}
else {
editor.setCursor({ line: 0, ch: 0 })
editor.scrollTo(0, 0)
}
}

function setLanguage(language: Language) {
Expand Down