Skip to content
Merged
Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions src/components/settingsPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import searchBar from "./searchbar";
* @property {(key:string)=>HTMLElement[]} search search for a setting
* @property {(title:string)=>void} setTitle set title of settings page
* @property {()=>void} restoreList restore list to original state
* @property {()=>HTMLDivElement} getListElement get the page's list element
*/

/**
Expand Down Expand Up @@ -114,6 +115,13 @@ export default function settingsPage(
$page.append(<div style={{ height: "50vh" }}></div>);

return {
/**
* Get this page's list element.
* @returns {HTMLDivElement}
*/
getListElement() {
return $list;
},
/**
* Show settings page
* @param {string} goTo Key of setting to scroll to and select
Expand Down
22 changes: 18 additions & 4 deletions src/settings/lspServerDetail.js
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,17 @@ function updateItemDisplay($list, itemsByKey, key, value, extras = {}) {
}
}

function getConnectedServerList(serverId, preferredList) {
if (preferredList?.isConnected) return preferredList;

return Array.from(
document.querySelectorAll(".detail-settings-list[data-lsp-server-id]"),
).find(
($list) =>
$list.isConnected && $list.dataset.lspServerId === String(serverId),
);
}

async function buildSnapshot(serverId) {
const liveServer = lspApi.servers.get(serverId);
if (!liveServer) return null;
Expand Down Expand Up @@ -541,20 +552,20 @@ export default function lspServerDetail(serverId) {
valueInTail: true,
},
);
const $pageList = page.getListElement();
$pageList.dataset.lspServerId = String(serverId);

const baseShow = page.show.bind(page);

return {
...page,
show(goTo) {
baseShow(goTo);
const $list = document.querySelector("#settings .main.list");
refreshVisibleState($list, itemsByKey, serverId).catch(console.error);
refreshVisibleState($pageList, itemsByKey, serverId).catch(console.error);
},
};

async function callback(key, value) {
const $list = this?.parentElement;
const $loader = loader.create("LSP", strings["loading..."]);

try {
Expand Down Expand Up @@ -776,7 +787,10 @@ export default function lspServerDetail(serverId) {
break;
}

await refreshVisibleState($list, itemsByKey, serverId);
const $connectedList = getConnectedServerList(serverId, $pageList);
if ($connectedList) {
await refreshVisibleState($connectedList, itemsByKey, serverId);
}
} finally {
$loader.destroy();
}
Expand Down