Skip to content

Commit 6d0b1ff

Browse files
NikolaRHristovNikolaRHristov
committed
1 parent 1e6a949 commit 6d0b1ff

17 files changed

Lines changed: 61 additions & 96 deletions

‎Source/ApplicationState/ApplicationState.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ pub struct ApplicationState {
9292
pub ActiveCustomDocuments:Arc<StandardMutex<HashMap<String, CustomDocumentStateDTO>>>,
9393
pub ActiveStatusBarItems:Arc<StandardMutex<HashMap<String, StatusBarEntryDTO>>>,
9494
pub ActiveTreeViews:Arc<StandardMutex<HashMap<String, TreeViewStateDTO>>>,
95-
pub ScmProviders:Arc<StandardMutex<HashMap<u32, SourceControlManagementProviderDTO>>>,
96-
pub ScmGroups:Arc<StandardMutex<HashMap<u32, HashMap<String, SourceControlManagementGroupDTO>>>>,
97-
pub ScmResources:Arc<StandardMutex<HashMap<u32, HashMap<String, Vec<SourceControlManagementResourceDTO>>>>>,
98-
pub NextScmProviderHandle:Arc<AtomicU32>,
95+
pub SourceControlManagementProviders:Arc<StandardMutex<HashMap<u32, SourceControlManagementProviderDTO>>>,
96+
pub SourceControlManagementGroups:Arc<StandardMutex<HashMap<u32, HashMap<String, SourceControlManagementGroupDTO>>>>,
97+
pub SourceControlManagementResources:Arc<StandardMutex<HashMap<u32, HashMap<String, Vec<SourceControlManagementResourceDTO>>>>>,
98+
pub NextSourceControlManagementProviderHandle:Arc<AtomicU32>,
9999

100100
// --- IPC & User Interface State ---
101101
pub PendingUserInterfaceRequests:
@@ -158,10 +158,10 @@ impl Default for ApplicationState {
158158
ActiveCustomDocuments:Arc::new(StandardMutex::new(HashMap::new())),
159159
ActiveStatusBarItems:Arc::new(StandardMutex::new(HashMap::new())),
160160
ActiveTreeViews:Arc::new(StandardMutex::new(HashMap::new())),
161-
ScmProviders:Arc::new(StandardMutex::new(HashMap::new())),
162-
ScmGroups:Arc::new(StandardMutex::new(HashMap::new())),
163-
ScmResources:Arc::new(StandardMutex::new(HashMap::new())),
164-
NextScmProviderHandle:Arc::new(AtomicU32::new(1)),
161+
SourceControlManagementProviders:Arc::new(StandardMutex::new(HashMap::new())),
162+
SourceControlManagementGroups:Arc::new(StandardMutex::new(HashMap::new())),
163+
SourceControlManagementResources:Arc::new(StandardMutex::new(HashMap::new())),
164+
NextSourceControlManagementProviderHandle:Arc::new(AtomicU32::new(1)),
165165
PendingUserInterfaceRequests:Arc::new(StandardMutex::new(HashMap::new())),
166166
}
167167
}
@@ -199,9 +199,9 @@ impl ApplicationState {
199199
/// Returns the next available unique identifier for a terminal instance.
200200
pub fn GetNextTerminalIdentifier(&self) -> u64 { self.NextTerminalIdentifier.fetch_add(1, AtomicOrdering::Relaxed) }
201201

202-
/// Returns the next available unique identifier for an SCM provider
202+
/// Returns the next available unique identifier for an SourceControlManagement provider
203203
/// instance.
204-
pub fn GetNextScmProviderHandle(&self) -> u32 { self.NextScmProviderHandle.fetch_add(1, AtomicOrdering::Relaxed) }
204+
pub fn GetNextSourceControlManagementProviderHandle(&self) -> u32 { self.NextSourceControlManagementProviderHandle.fetch_add(1, AtomicOrdering::Relaxed) }
205205

206206
/// Updates the path to the workspace memento file and reloads its content
207207
/// from disk.

‎Source/ApplicationState/DTO/mod.rs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,3 @@ pub mod TreeViewStateDTO;
2020
pub mod WebViewStateDTO;
2121
pub mod WindowStateDTO;
2222
pub mod WorkSpaceFolderStateDTO;
23-
24-
// --- Public Re-exports (alphabetical) ---
25-
// pub use self::CustomDocumentStateDTO::CustomDocumentStateDTO;
26-
// pub use self::DocumentStateDTO::DocumentStateDTO;
27-
// pub use self::ExtensionDescriptionStateDTO::ExtensionDescriptionStateDTO;
28-
// pub use self::MarkerDataDTO::MarkerDataDTO;
29-
// pub use self::MergedConfigurationStateDTO::MergedConfigurationStateDTO;
30-
// pub use self::OutputChannelStateDTO::OutputChannelStateDTO;
31-
// pub use self::ProviderRegistrationDTO::ProviderRegistrationDTO;
32-
// pub use self::RPCModelContentChangeDTO::{RPCModelContentChangeDTO,
33-
// RPCRangeDTO}; pub use self::TerminalStateDTO::TerminalStateDTO;
34-
// pub use self::TreeViewStateDTO::TreeViewStateDTO;
35-
// pub use self::WebViewStateDTO::WebViewStateDTO;
36-
// pub use self::WindowStateDTO::WindowStateDTO;
37-
// pub use self::WorkSpaceFolderStateDTO::WorkSpaceFolderStateDTO;

‎Source/Binary.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ pub fn Fn() {
245245
Command::LanguageFeature::MountainProvideCompletions,
246246
Command::LanguageFeature::MountainProvideDefinition,
247247
Command::LanguageFeature::MountainProvideReferences,
248-
Command::Scm::GetAllScmState,
248+
Command::SourceControlManagement::GetAllSourceControlManagementState,
249249
Command::Keybinding::GetResolvedKeybinding,
250250
crate::Track::DispatchLogic::DispatchFrontendCommand,
251251
crate::Track::DispatchLogic::ResolveUIRequest,

‎Source/Command/Scm.rs‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎Source/Command/SourceControlManagement.rs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
//! # SourceControlManagement Commands
2+
//!
3+
//! Defines the specific Tauri command handlers for SourceControlManagement data requests
4+
//! that originate from the `Sky` frontend UI.
5+
6+
#![allow(non_snake_case, non_camel_case_types)]
7+
8+
use std::sync::Arc;
9+
10+
use serde_json::{Value, json};
11+
use tauri::{State, command};
12+
13+
use crate::ApplicationState::ApplicationState::ApplicationState;
14+
15+
#[command]
16+
pub async fn GetAllSourceControlManagementState(state:State<'_, Arc<ApplicationState>>) -> Result<Value, String> {
17+
log::debug!("[SourceControlManagement Command] Getting all SourceControlManagement state for UI.");
18+
19+
let providers = state.SourceControlManagementProviders.lock().unwrap().clone();
20+
let groups = state.SourceControlManagementGroups.lock().unwrap().clone();
21+
let resources = state.SourceControlManagementResources.lock().unwrap().clone();
22+
23+
Ok(json!({
24+
"providers": providers,
25+
"groups": groups,
26+
"resources": resources
27+
}))
28+
}

‎Source/Command/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
pub mod Bootstrap;
1515
pub mod Keybinding;
1616
pub mod LanguageFeature;
17-
pub mod Scm;
17+
pub mod SourceControlManagement;
1818
pub mod TreeView;

‎Source/Environment/SourceControlManagementProvider.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ use super::MountainEnvironment::MountainEnvironment;
3030
impl SourceControlManagementProvider for MountainEnvironment {
3131
async fn CreateSourceControl(&self, ProviderDataValue:Value) -> Result<u32, CommonError> {
3232
let ProviderData:SourceControlCreateDTO = serde_json::from_value(ProviderDataValue)?;
33-
let Handle = self.ApplicationState.GetNextScmProviderHandle();
34-
info!("[SCMProvider] Creating new SCM provider with handle {}", Handle);
33+
let Handle = self.ApplicationState.GetNextSourceControlManagementProviderHandle();
34+
info!("[SourceControlManagementProvider] Creating new SourceControlManagement provider with handle {}", Handle);
3535

3636
let ProviderState = SourceControlManagementProviderDTO {
3737
Handle,
@@ -43,12 +43,12 @@ impl SourceControlManagementProvider for MountainEnvironment {
4343
};
4444

4545
self.ApplicationState
46-
.ScmProviders
46+
.SourceControlManagementProviders
4747
.lock()
4848
.unwrap()
4949
.insert(Handle, ProviderState.clone());
5050
self.ApplicationState
51-
.ScmGroups
51+
.SourceControlManagementGroups
5252
.lock()
5353
.unwrap()
5454
.insert(Handle, Default::default());
@@ -61,10 +61,10 @@ impl SourceControlManagementProvider for MountainEnvironment {
6161
}
6262

6363
async fn DisposeSourceControl(&self, ProviderHandle:u32) -> Result<(), CommonError> {
64-
info!("[SCMProvider] Disposing SCM provider with handle {}", ProviderHandle);
64+
info!("[SourceControlManagementProvider] Disposing SourceControlManagement provider with handle {}", ProviderHandle);
6565

66-
self.ApplicationState.ScmProviders.lock().unwrap().remove(&ProviderHandle);
67-
self.ApplicationState.ScmGroups.lock().unwrap().remove(&ProviderHandle);
66+
self.ApplicationState.SourceControlManagementProviders.lock().unwrap().remove(&ProviderHandle);
67+
self.ApplicationState.SourceControlManagementGroups.lock().unwrap().remove(&ProviderHandle);
6868

6969
self.ApplicationHandle
7070
.emit("sky://scm/provider/removed", ProviderHandle)
@@ -74,9 +74,9 @@ impl SourceControlManagementProvider for MountainEnvironment {
7474

7575
async fn UpdateSourceControl(&self, ProviderHandle:u32, UpdateDataValue:Value) -> Result<(), CommonError> {
7676
let UpdateData:SourceControlUpdateDTO = serde_json::from_value(UpdateDataValue)?;
77-
info!("[SCMProvider] Updating provider {}", ProviderHandle);
77+
info!("[SourceControlManagementProvider] Updating provider {}", ProviderHandle);
7878

79-
if let Some(Provider) = self.ApplicationState.ScmProviders.lock().unwrap().get_mut(&ProviderHandle) {
79+
if let Some(Provider) = self.ApplicationState.SourceControlManagementProviders.lock().unwrap().get_mut(&ProviderHandle) {
8080
if let Some(count) = UpdateData.Count {
8181
Provider.Count = Some(count);
8282
}
@@ -99,11 +99,11 @@ impl SourceControlManagementProvider for MountainEnvironment {
9999
async fn UpdateSourceControlGroup(&self, ProviderHandle:u32, GroupDataValue:Value) -> Result<(), CommonError> {
100100
let GroupData:SourceControlGroupUpdateDTO = serde_json::from_value(GroupDataValue)?;
101101
info!(
102-
"[SCMProvider] Updating group '{}' for provider {}",
102+
"[SourceControlManagementProvider] Updating group '{}' for provider {}",
103103
GroupData.GroupID, ProviderHandle
104104
);
105105

106-
if let Some(ProviderGroups) = self.ApplicationState.ScmGroups.lock().unwrap().get_mut(&ProviderHandle) {
106+
if let Some(ProviderGroups) = self.ApplicationState.SourceControlManagementGroups.lock().unwrap().get_mut(&ProviderHandle) {
107107
let Group = ProviderGroups.entry(GroupData.GroupID.clone()).or_insert_with(|| {
108108
SourceControlManagementGroupDTO {
109109
ProviderHandle,
@@ -122,7 +122,7 @@ impl SourceControlManagementProvider for MountainEnvironment {
122122
.map_err(|e| CommonError::UserInterfaceInteraction { Reason:e.to_string() })?;
123123
} else {
124124
warn!(
125-
"[SCMProvider] Received group update for unknown provider handle: {}",
125+
"[SourceControlManagementProvider] Received group update for unknown provider handle: {}",
126126
ProviderHandle
127127
);
128128
}
@@ -132,9 +132,9 @@ impl SourceControlManagementProvider for MountainEnvironment {
132132

133133
async fn RegisterInputBox(&self, ProviderHandle:u32, InputBoxDataValue:Value) -> Result<(), CommonError> {
134134
let InputBoxData:SourceControlInputBoxDTO = serde_json::from_value(InputBoxDataValue)?;
135-
info!("[SCMProvider] Registering input box for provider {}", ProviderHandle);
135+
info!("[SourceControlManagementProvider] Registering input box for provider {}", ProviderHandle);
136136

137-
if let Some(Provider) = self.ApplicationState.ScmProviders.lock().unwrap().get_mut(&ProviderHandle) {
137+
if let Some(Provider) = self.ApplicationState.SourceControlManagementProviders.lock().unwrap().get_mut(&ProviderHandle) {
138138
Provider.InputBox = Some(InputBoxData);
139139
self.ApplicationHandle
140140
.emit(

‎Source/ExtensionManagement/mod.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@
33
#![allow(non_snake_case)]
44

55
pub mod Scanner;
6-
7-
// pub use self::ExtensionManagement::*;

‎Source/FileSystem/mod.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@
33
#![allow(non_snake_case)]
44

55
pub mod FileExplorerViewProvider;
6-
7-
// pub use self::FileSystem::*;

‎Source/Library.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ pub mod Track;
1919
pub mod Vine;
2020
pub mod WorkSpace;
2121

22-
// TEMPORARY DISABLE
23-
// pub mod Update;
24-
2522
// The main binary entry point is defined in its own module.
2623
pub mod Binary;
2724

0 commit comments

Comments
 (0)