Skip to content
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3d5b104
add code mirror basic functions
senithkay Nov 12, 2025
968718f
add completions
senithkay Nov 14, 2025
df64dc4
Add helperpane support
senithkay Nov 14, 2025
d83da15
Merge branch 'expressionEditor-codemirror' into expression-code-mirro…
senithkay Nov 14, 2025
2e7a73d
fix expanded mode after sync
senithkay Nov 14, 2025
96d30a5
fix expanded editor with new code mirror changes
senithkay Nov 14, 2025
442dc91
fix floating buttons in expanded view
senithkay Nov 14, 2025
16f6c7a
add function signature handling
senithkay Nov 14, 2025
4c4195b
add hack comment for future reference
senithkay Nov 14, 2025
5f6f587
rename editor component to chipexpressioneditor
senithkay Nov 14, 2025
b930fbc
add right padding to the editor to make space for the floating buttons
senithkay Nov 14, 2025
fa52286
Address PR comments
senithkay Nov 14, 2025
56a97cd
Address PR comments
senithkay Nov 14, 2025
f46450c
Add custom height adjustment to the expression component
senithkay Nov 14, 2025
4a4816a
Merge branch 'expressionEditor-codemirror' into merge-with-bi
senithkay Nov 14, 2025
cf65a29
Merge branch 'bi-1.5.x' of https://github.com/wso2/vscode-extensions …
senithkay Nov 14, 2025
6d12da0
fix merge issues
senithkay Nov 14, 2025
0d64524
add replace full text handler
senithkay Nov 14, 2025
ac121c3
fix selection event firing
senithkay Nov 14, 2025
2259516
Merge branch 'expressionEditor-codemirror' into merge-with-bi
senithkay Nov 14, 2025
0d65ff8
fix record config append the values on initial load
senithkay Nov 14, 2025
8626e53
fix build errors
senithkay Nov 14, 2025
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
12 changes: 12 additions & 0 deletions common/config/rush/pnpm-lock.yaml

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

6 changes: 5 additions & 1 deletion workspaces/ballerina/ballerina-side-panel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@
"lodash": "~4.17.21",
"react-hook-form": "7.56.4",
"react-markdown": "~10.1.0",
"@github/markdown-toolbar-element": "^2.2.3"
"@github/markdown-toolbar-element": "^2.2.3",
"@codemirror/commands": "~6.10.0",
"@codemirror/state": "~6.5.2",
"@codemirror/view": "~6.38.6",
"@codemirror/autocomplete": "~6.19.1"
},
"devDependencies": {
"@storybook/react": "^6.5.16",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import React from "react";
import styled from "@emotion/styled";
import { EditorModeExpressionProps } from "./types";
import { ChipExpressionBaseComponent } from "../../MultiModeExpressionEditor/ChipExpressionEditor/ChipExpressionBaseComponent";
import { ChipExpressionEditorComponent } from "../../MultiModeExpressionEditor/ChipExpressionEditor/components/ChipExpressionEditor";

const ExpressionContainer = styled.div`
width: 100%;
Expand Down Expand Up @@ -48,7 +48,7 @@ export const ExpressionMode: React.FC<EditorModeExpressionProps> = ({

return (
<ExpressionContainer>
<ChipExpressionBaseComponent
<ChipExpressionEditorComponent
value={value}
onChange={handleChange}
completions={completions}
Expand All @@ -57,6 +57,7 @@ export const ExpressionMode: React.FC<EditorModeExpressionProps> = ({
extractArgsFromFunction={extractArgsFromFunction}
getHelperPane={getHelperPane}
isInExpandedMode={true}
isExpandedVersion={true}
/>
</ExpressionContainer>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import {
import { S } from './ExpressionEditor';
import TextModeEditor from './MultiModeExpressionEditor/TextExpressionEditor/TextModeEditor';
import { InputMode } from './MultiModeExpressionEditor/ChipExpressionEditor/types';
import { ChipExpressionBaseComponent } from './MultiModeExpressionEditor/ChipExpressionEditor/ChipExpressionBaseComponent';
import { LineRange } from '@wso2/ballerina-core/lib/interfaces/common';
import { HelperpaneOnChangeOptions } from '../Form/types';
import { ChipExpressionEditorComponent } from './MultiModeExpressionEditor/ChipExpressionEditor/components/ChipExpressionEditor';

export interface ExpressionField {
inputMode: InputMode;
Expand Down Expand Up @@ -150,8 +150,9 @@ export const ExpressionField: React.FC<ExpressionField> = ({
}

return (
<ChipExpressionBaseComponent
<ChipExpressionEditorComponent
getHelperPane={getHelperPane}
isExpandedVersion={false}
completions={completions}
onChange={onChange}
value={value}
Expand Down
Loading
Loading