zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-24 06:12:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

collab: Fix exact extension filtering (#14591)

Browse Source 
This PR fixes the exact extension filtering introduced in #14588.

As we traversed the extensions we were always updating `exact_match`,
regardless of whether it matched the extension ID from the filter.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-07-16 15:18:48 -04:00 committed by GitHub
parent 8028e7f1b6
commit ef5305869f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
crates/collab/src/api/extensions.rs
View File

@ -10,7 +10,7 @@ use axum::{
Extension, Json, Router,
};
use collections::HashMap;
use rpc::{ExtensionApiManifest, ExtensionMetadata, GetExtensionsResponse};
use rpc::{ExtensionApiManifest, GetExtensionsResponse};
use semantic_version::SemanticVersion;
use serde::Deserialize;
use std::{sync::Arc, time::Duration};
@ -48,28 +48,36 @@ async fn get_extensions(
.get_extensions(params.filter.as_deref(), params.max_schema_version, 500)
.await?;
if let Some(query) = params.filter.as_deref() {
let count = extensions.len();
tracing::info!(query, count, "extension_search")
}
if let Some(filter) = params.filter.as_deref() {
let mut exact_match: Option<ExtensionMetadata> = None;
let extension_id = filter.to_lowercase();
let mut exact_match = None;
extensions.retain(|extension| {
exact_match = Some(extension.clone());
extension.id.as_ref() != &filter.to_lowercase()
if extension.id.as_ref() == &extension_id {
exact_match = Some(extension.clone());
false
} else {
true
}
});
if exact_match == None {
if exact_match.is_none() {
exact_match = app
.db
.get_extensions_by_ids(&[&filter.to_lowercase()], None)
.get_extensions_by_ids(&[&extension_id], None)
.await?
.first()
.cloned();
}
extensions.splice(0..0, exact_match);
if let Some(exact_match) = exact_match {
extensions.insert(0, exact_match);
}
};
if let Some(query) = params.filter.as_deref() {
let count = extensions.len();
tracing::info!(query, count, "extension_search")
}
Ok(Json(GetExtensionsResponse { data: extensions }))
}