Skip to content

Commit 512ffdb

Browse files
Merge remote-tracking branch 'upstream' into check-error
2 parents 4dec41a + 9131ef2 commit 512ffdb

File tree

127 files changed

+2279
-1560
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+2279
-1560
lines changed

common/config/rush/pnpm-lock.yaml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

workspaces/ballerina/ballerina-core/src/interfaces/extended-lang-client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ export interface ExecutorPositions {
568568
// Test Manager related interfaces
569569

570570
export interface TestsDiscoveryRequest {
571-
filePath: string;
571+
projectPath: string;
572572
}
573573

574574
export interface TestsDiscoveryResponse {

workspaces/ballerina/ballerina-core/src/rpc-types/ai-panel/interfaces.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ export interface DataMappingRecord {
168168
}
169169

170170
export interface GenerateTypesFromRecordRequest {
171-
attachment?: Attachment[]
171+
attachment: Attachment[]
172172
}
173173

174174
export interface GenerateTypesFromRecordResponse {

workspaces/ballerina/ballerina-core/src/rpc-types/bi-diagram/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ import {
118118
RecordsInWorkspaceMentions,
119119
BuildMode,
120120
DevantMetadata,
121-
GeneratedClientSaveResponse
121+
GeneratedClientSaveResponse,
122+
AddProjectToWorkspaceRequest
122123
} from "./interfaces";
123124

124125
export interface BIDiagramAPI {
@@ -137,6 +138,7 @@ export interface BIDiagramAPI {
137138
getNodeTemplate: (params: BINodeTemplateRequest) => Promise<BINodeTemplateResponse>;
138139
getAiSuggestions: (params: BIAiSuggestionsRequest) => Promise<BIAiSuggestionsResponse>;
139140
createProject: (params: ProjectRequest) => void;
141+
addProjectToWorkspace: (params: AddProjectToWorkspaceRequest) => void;
140142
getWorkspaces: () => Promise<WorkspacesResponse>;
141143
getProjectStructure: () => Promise<ProjectStructureResponse>;
142144
getProjectComponents: () => Promise<ProjectComponentsResponse>;

workspaces/ballerina/ballerina-core/src/rpc-types/bi-diagram/interfaces.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,18 @@ export interface ProjectRequest {
2727
packageName: string;
2828
projectPath: string;
2929
createDirectory: boolean;
30+
createAsWorkspace?: boolean;
31+
workspaceName?: string;
32+
orgName?: string;
33+
version?: string;
34+
}
35+
36+
export interface AddProjectToWorkspaceRequest {
37+
projectName: string;
38+
packageName: string;
39+
path: string;
40+
convertToWorkspace?: boolean;
41+
workspaceName?: string;
3042
orgName?: string;
3143
version?: string;
3244
}

workspaces/ballerina/ballerina-core/src/rpc-types/bi-diagram/rpc-type.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ import {
120120
RecordsInWorkspaceMentions,
121121
BuildMode,
122122
DevantMetadata,
123-
GeneratedClientSaveResponse
123+
GeneratedClientSaveResponse,
124+
AddProjectToWorkspaceRequest
124125
} from "./interfaces";
125126
import { RequestType, NotificationType } from "vscode-messenger-common";
126127

@@ -140,6 +141,7 @@ export const getEnclosedFunction: RequestType<BIGetEnclosedFunctionRequest, BIGe
140141
export const getNodeTemplate: RequestType<BINodeTemplateRequest, BINodeTemplateResponse> = { method: `${_preFix}/getNodeTemplate` };
141142
export const getAiSuggestions: RequestType<BIAiSuggestionsRequest, BIAiSuggestionsResponse> = { method: `${_preFix}/getAiSuggestions` };
142143
export const createProject: NotificationType<ProjectRequest> = { method: `${_preFix}/createProject` };
144+
export const addProjectToWorkspace: NotificationType<AddProjectToWorkspaceRequest> = { method: `${_preFix}/addProjectToWorkspace` };
143145
export const getWorkspaces: RequestType<void, WorkspacesResponse> = { method: `${_preFix}/getWorkspaces` };
144146
export const getProjectStructure: RequestType<void, ProjectStructureResponse> = { method: `${_preFix}/getProjectStructure` };
145147
export const getProjectComponents: RequestType<void, ProjectComponentsResponse> = { method: `${_preFix}/getProjectComponents` };

workspaces/ballerina/ballerina-core/src/rpc-types/lang-client/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@
1717
*/
1818

1919
import { BallerinaPackagesParams, BallerinaProjectComponents, BallerinaSTParams, ComponentModels, ComponentModelsParams, ExecutorPositions, PartialST, PartialSTParams, ProjectDiagnosticsRequest, ProjectDiagnosticsResponse, STModifyParams, SymbolInfo, SymbolInfoParams, SyntaxTree, SyntaxTreeParams, TypeFromExpressionParams, TypeFromSymbolParams, TypesFromFnDefinitionParams } from "../../interfaces/extended-lang-client";
20-
import { BallerinaVersionResponse, CompletionRequest, CompletionResponse, DiagnosticsResponse, CodeActionRequest, CodeActionResponse, RenameRequest, RenameResponse, DefinitionPositionRequest, UpdateFileContentRequest, UpdateFileContentResponse, DefinitionResponse, ExecutorPositionsRequest, DidCloseRequest, TypesFromExpressionResponse, TypesFromSymbolResponse, DidOpenRequest, DidChangeRequest } from "./interfaces";
20+
import { BallerinaVersionResponse, CompletionRequest, CompletionResponse, DiagnosticsResponse, CodeActionRequest, CodeActionResponse, RenameRequest, RenameResponse, DefinitionPositionRequest, UpdateFileContentRequest, UpdateFileContentResponse, DefinitionResponse, ExecutorPositionsRequest, DidCloseRequest, TypesFromExpressionResponse, TypesFromSymbolResponse, DidOpenRequest, DidChangeRequest, SemanticVersion } from "./interfaces";
2121

2222
export interface LangClientAPI {
2323
getSyntaxTree: () => Promise<SyntaxTree>;
2424
getST: (params: SyntaxTreeParams) => Promise<SyntaxTree>;
2525
getSTByRange: (params: BallerinaSTParams) => Promise<SyntaxTree>;
2626
getBallerinaProjectComponents: (params: BallerinaPackagesParams) => Promise<BallerinaProjectComponents>;
2727
getBallerinaVersion: () => Promise<BallerinaVersionResponse>;
28+
isSupportedSLVersion: (params: SemanticVersion) => Promise<boolean>;
2829
getCompletion: (params: CompletionRequest) => Promise<CompletionResponse>;
2930
getDiagnostics: (params: SyntaxTreeParams) => Promise<DiagnosticsResponse>;
3031
getProjectDiagnostics: (params: ProjectDiagnosticsRequest) => Promise<ProjectDiagnosticsResponse>;

workspaces/ballerina/ballerina-core/src/rpc-types/lang-client/interfaces.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,10 @@ export interface TypesFromSymbolResponse {
163163

164164
export interface ExecutorPositionsResponse {
165165
executorPositions?: ExecutorPosition[];
166-
}
166+
}
167+
168+
export interface SemanticVersion {
169+
major: number;
170+
minor: number;
171+
patch: number;
172+
}

workspaces/ballerina/ballerina-core/src/rpc-types/lang-client/rpc-type.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* THIS FILE INCLUDES AUTO GENERATED CODE
1919
*/
2020
import { BallerinaPackagesParams, BallerinaProjectComponents, BallerinaSTParams, ComponentModels, ComponentModelsParams, ExecutorPositions, PartialST, PartialSTParams, ProjectDiagnosticsRequest, ProjectDiagnosticsResponse, STModifyParams, SymbolInfo, SymbolInfoParams, SyntaxTree, SyntaxTreeParams, TypeFromExpressionParams, TypeFromSymbolParams, TypesFromFnDefinitionParams } from "../../interfaces/extended-lang-client";
21-
import { BallerinaVersionResponse, CompletionRequest, CompletionResponse, DiagnosticsResponse, CodeActionRequest, CodeActionResponse, RenameRequest, RenameResponse, DefinitionPositionRequest, UpdateFileContentRequest, UpdateFileContentResponse, DefinitionResponse, ExecutorPositionsRequest, DidCloseRequest, TypesFromExpressionResponse, TypesFromSymbolResponse, DidOpenRequest, DidChangeRequest } from "./interfaces";
21+
import { BallerinaVersionResponse, CompletionRequest, CompletionResponse, DiagnosticsResponse, CodeActionRequest, CodeActionResponse, RenameRequest, RenameResponse, DefinitionPositionRequest, UpdateFileContentRequest, UpdateFileContentResponse, DefinitionResponse, ExecutorPositionsRequest, DidCloseRequest, TypesFromExpressionResponse, TypesFromSymbolResponse, DidOpenRequest, DidChangeRequest, SemanticVersion } from "./interfaces";
2222
import { RequestType, NotificationType } from "vscode-messenger-common";
2323

2424
const _preFix = "lang-client";
@@ -27,6 +27,7 @@ export const getST: RequestType<SyntaxTreeParams, SyntaxTree> = { method: `${_pr
2727
export const getSTByRange: RequestType<BallerinaSTParams, SyntaxTree> = { method: `${_preFix}/getSTByRange` };
2828
export const getBallerinaProjectComponents: RequestType<BallerinaPackagesParams, BallerinaProjectComponents> = { method: `${_preFix}/getBallerinaProjectComponents` };
2929
export const getBallerinaVersion: RequestType<void, BallerinaVersionResponse> = { method: `${_preFix}/getBallerinaVersion` };
30+
export const isSupportedSLVersion: RequestType<SemanticVersion, boolean> = { method: `${_preFix}/isSupportedSLVersion` };
3031
export const getCompletion: RequestType<CompletionRequest, CompletionResponse> = { method: `${_preFix}/getCompletion` };
3132
export const getDiagnostics: RequestType<SyntaxTreeParams, DiagnosticsResponse> = { method: `${_preFix}/getDiagnostics` };
3233
export const getProjectDiagnostics: RequestType<ProjectDiagnosticsRequest, ProjectDiagnosticsResponse> = { method: `${_preFix}/getProjectDiagnostics` };

workspaces/ballerina/ballerina-core/src/state-machine-types.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ export enum MACHINE_VIEW {
7777
BIWelcome = "BI Welcome",
7878
BIProjectForm = "BI Project SKIP",
7979
BIImportIntegration = "BI Import Integration SKIP",
80+
BIAddProjectForm = "BI Add Project SKIP",
8081
BIComponentView = "BI Component View",
8182
AddConnectionWizard = "Add Connection Wizard",
8283
AddCustomConnector = "Add Custom Connector",
@@ -120,7 +121,8 @@ export type FocusFlowDiagramView = typeof FOCUS_FLOW_DIAGRAM_VIEW[keyof typeof F
120121
export interface VisualizerLocation {
121122
view?: MACHINE_VIEW | null;
122123
documentUri?: string;
123-
projectUri?: string;
124+
projectPath?: string;
125+
workspacePath?: string;
124126
identifier?: string;
125127
parentIdentifier?: string;
126128
artifactType?: DIRECTORY_MAP;

0 commit comments

Comments
 (0)