Switch to RustLS (#2169)

* Switch to RustLS

* Revert scroll change causing autoscroll to break

* App build remove
This commit is contained in:
Geometrically
2024-08-17 13:37:45 -07:00
committed by GitHub
parent 910e219c0e
commit c84e2e0537
9 changed files with 307 additions and 776 deletions

View File

@@ -25,7 +25,7 @@
"vue": "^3.4.21",
"vue-multiselect": "3.0.0",
"vue-router": "4.3.0",
"vue-typed-virtual-list": "^1.0.10"
"vue-virtual-scroller": "v2.0.0-beta.8"
},
"devDependencies": {
"@tauri-apps/cli": "^1.6.0",

View File

@@ -40,11 +40,11 @@ const handleSearchContent = async () => {
:options="[
{
id: 'search',
action: () => handleSearchContent,
action: handleSearchContent,
},
{
id: 'from_file',
action: () => handleAddContentFromFile,
action: handleAddContentFromFile,
},
]"
class="btn btn-primary btn-dropdown-animation icon-only"

View File

@@ -59,21 +59,22 @@
</div>
</div>
<div class="log-text">
<VirtualScroller
<RecycleScroller
v-slot="{ item }"
ref="logContainer"
class="scroller"
:default-size="20"
:items="displayProcessedLogs"
direction="vertical"
:item-size="20"
key-field="id"
>
<template #item="{ ref }">
<div class="user no-wrap">
<span :style="{ color: ref.prefixColor, 'font-weight': ref.weight }">{{
ref.prefix
}}</span>
<span :style="{ color: ref.textColor }">{{ ref.text }}</span>
</div>
</template>
</VirtualScroller>
<div class="user no-wrap">
<span :style="{ color: item.prefixColor, 'font-weight': item.weight }">{{
item.prefix
}}</span>
<span :style="{ color: item.textColor }">{{ item.text }}</span>
</div>
</RecycleScroller>
</div>
<ShareModal
ref="shareModal"
@@ -104,13 +105,12 @@ import { useRoute } from 'vue-router'
import { process_listener } from '@/helpers/events.js'
import { handleError } from '@/store/notifications.js'
import { ofetch } from 'ofetch'
import { createVirtualScroller } from 'vue-typed-virtual-list'
import { RecycleScroller } from 'vue-virtual-scroller'
import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
dayjs.extend(isToday)
dayjs.extend(isYesterday)
const VirtualScroller = createVirtualScroller()
const route = useRoute()
const props = defineProps({
@@ -412,20 +412,15 @@ function handleUserScroll() {
interval.value = setInterval(async () => {
if (logs.value.length > 0) {
logs.value[0] = await getLiveStdLog()
const logContainerElement = logContainer.value.$el
const scroll =
logContainerElement.scrollHeight -
logContainerElement.scrollTop -
logContainerElement.clientHeight
// const scroll = logContainer.value.$el.scrollHeight - logContainer.value.$el.scrollTop - logContainer.value.$el.clientHeight
const scroll = logContainer.value.getScroll()
// Allow resetting of userScrolled if the user scrolls to the bottom
if (selectedLogIndex.value === 0) {
if (scroll <= 10) userScrolled.value = false
if (scroll.end >= logContainer.value.$el.scrollHeight - 10) userScrolled.value = false
if (!userScrolled.value) {
await nextTick()
isAutoScrolling.value = true
logContainer.value.scrollTo(displayProcessedLogs.value.length - 1)
logContainer.value.scrollToItem(displayProcessedLogs.value.length - 1)
setTimeout(() => (isAutoScrolling.value = false), 50)
}
}

View File

@@ -372,7 +372,6 @@ import { formatProjectType } from '@modrinth/utils'
import { computed, onUnmounted, ref, watch } from 'vue'
import {
add_project_from_path,
get,
get_projects,
remove_project,
toggle_disable_project,

View File

@@ -40,9 +40,6 @@ os_info = "3.7.0"
tracing = "0.1.37"
tracing-error = "0.2.0"
sentry = "0.32.2"
sentry-rust-minidump = "0.7.0"
lazy_static = "1"
once_cell = "1"