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
16 changes: 9 additions & 7 deletions lsp/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lsp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ name = "lsp"
path = "src/main.rs"

[dependencies]
iii-sdk = "=0.19.2"
iii-sdk = "=0.20.0"
tower-lsp-server = "0.23"
tree-sitter = "0.24"
tree-sitter-typescript = "0.23"
Expand Down
5 changes: 3 additions & 2 deletions lsp/src/engine_client.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
use dashmap::{DashMap, DashSet};
use iii_sdk::{register_worker, IIIConnectionState, InitOptions, WorkerMetadata, III};
use iii_sdk::runtime::{IIIConnectionState, WorkerMetadata};
use iii_sdk::{register_worker, IIIClient, InitOptions};
use std::sync::{Arc, Mutex};

use crate::engine_introspection::{self, FunctionInfo, TriggerInfo, TriggerTypeInfo, WorkerInfo};

pub struct EngineClient {
iii: III,
iii: IIIClient,
pub functions: DashMap<String, FunctionInfo>,
pub trigger_types: DashMap<String, TriggerTypeInfo>,
pub workers: DashMap<String, WorkerInfo>,
Expand Down
16 changes: 9 additions & 7 deletions lsp/src/engine_introspection.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
use iii_sdk::{IIIError, TriggerRequest, III};
use iii_sdk::errors::Error;
use iii_sdk::protocol::TriggerRequest;
use iii_sdk::IIIClient;
use serde::{Deserialize, Serialize};
use serde_json::Value;

Expand Down Expand Up @@ -51,7 +53,7 @@ pub struct WorkerInfo {
pub isolation: Option<String>,
}

pub async fn list_functions(iii: &III) -> Result<Vec<FunctionInfo>, IIIError> {
pub async fn list_functions(iii: &IIIClient) -> Result<Vec<FunctionInfo>, Error> {
let result = iii
.trigger(TriggerRequest {
function_id: "engine::functions::list".into(),
Expand All @@ -66,7 +68,7 @@ pub async fn list_functions(iii: &III) -> Result<Vec<FunctionInfo>, IIIError> {
.unwrap_or_default())
}

pub async fn list_workers(iii: &III) -> Result<Vec<WorkerInfo>, IIIError> {
pub async fn list_workers(iii: &IIIClient) -> Result<Vec<WorkerInfo>, Error> {
let result = iii
.trigger(TriggerRequest {
function_id: "engine::workers::list".into(),
Expand All @@ -82,9 +84,9 @@ pub async fn list_workers(iii: &III) -> Result<Vec<WorkerInfo>, IIIError> {
}

pub async fn list_triggers(
iii: &III,
iii: &IIIClient,
include_internal: bool,
) -> Result<Vec<TriggerInfo>, IIIError> {
) -> Result<Vec<TriggerInfo>, Error> {
let result = iii
.trigger(TriggerRequest {
function_id: "engine::registered-triggers::list".into(),
Expand All @@ -100,9 +102,9 @@ pub async fn list_triggers(
}

pub async fn list_trigger_types(
iii: &III,
iii: &IIIClient,
include_internal: bool,
) -> Result<Vec<TriggerTypeInfo>, IIIError> {
) -> Result<Vec<TriggerTypeInfo>, Error> {
let result = iii
.trigger(TriggerRequest {
function_id: "engine::triggers::list".into(),
Expand Down
Loading