Shire Skecth: A Multi-file viewer, render and edit #153

phodal · 2024-12-02T07:00:24Z

Is your feature request related to a problem? Please describe.
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

Describe the solution you'd like
A clear and concise description of what you want to happen.

Describe alternatives you've considered
A clear and concise description of any alternative solutions or features you've considered.

Additional context
Add any other context or screenshots about the feature request here.

Sketch

Diff Sketch

Inlay Diff
Apply, Revert Menu (AllIcons.Actions.Rollback), Cancel (AllIcons.Vcs.Abort)

IDEA Apis:

<action id="Vcs.RollbackChangedLines" class="com.intellij.openapi.vcs.ex.RollbackLineStatusAction" icon="AllIcons.Actions.Rollback"/>
<action id="Vcs.ShowDiffChangedLines" class="com.intellij.openapi.vcs.ex.ShowDiffLineStatusAction" icon="AllIcons.Actions.Diff"/>

UI: TwosideContentPanel with: SimpleDiffViewer

Mermaid Sketch

https://plugins.jetbrains.com/plugin/20146-mermaid

PlantUML Sketch

https://plugins.jetbrains.com/plugin/7017-plantuml-integration

Error Handling (TBC)

Goto symbol: /goto
Compile output with HyperLink => AutoParse

Compile output:

Prepare for running goto-symbol.shire...
Shire Script: /Users/phodal/IdeaProjects/shire-demo/.shire/command/goto-symbol.shire
Shire Script Compile output:
/Users/phodal/IdeaProjects/shire-demo/src/main/java/com/phodal/shire/demo/controller/AdvertiseController.java

--------------------
Local command detected, running in local mode
Process finished with exit code 0

The text was updated successfully, but these errors were encountered:

Add the ability to navigate to a specific line and column in a file using the `/goto` command. This feature includes the implementation of the GotoShireCommand class, updates to the ShireSyntaxAnalyzer to handle the new command, and documentation enhancements to reflect the addition of the `/goto` command to the Shire command set.

The changes enhance the GotoShireCommand by providing clearer navigation feedback in the form of a formatted string that includes the file name and line number. Additionally, the code has been cleaned up by removing unnecessary comments and simplifying the document offset calculation.

OiAnthony · 2024-12-03T09:12:25Z

Multiple file editing combined with Chat Panel might be a good idea.

…r enhanced code representation #153 Update CodeFence parsing to use "text" as the default language for plain text blocks. Additionally, optimize ShirePanelView by rearranging components and enhancing code block view to support specific languages. This results in a cleaner UI and more accurate code rendering. ```diff - CodeFence(findLanguage("markdown"), textBuilder.trim().toString(), true, "txt", true) + CodeFence(findLanguage("text"), textBuilder.trim().toString(), true, "txt", true) // Other UI and code representation improvements... ```

- Introduce new action `ShireDiffCodeAction` for code diffing in the toolbar. - Add corresponding XML configuration and Kotlin class.

- Renamed CodeBlockView to CodeBlockViewer and moved to new package. - Added SketchViewer interface for viewer components. - Updated references and method names to align with new class structure.

- Implement `DiffPatchViewer` for displaying diffs. - Add `ShireViewDiffAction` and `ShireRejectDiffAction` to diff toolbar. - Rename `ShireDiffCodeAction` to `ShireAcceptDiffAction`. - Update XML configuration for new toolbar actions. - Modify `CodeBlockViewer` to include `getComponent` method. - Refactor `fullWidth` and `fullHeight` methods to `SketchViewer` interface.

Removed XML-defined actions for diff view toolbar and replaced them with inline JButton components in DiffPatchViewer.kt. This change simplifies the UI code and enhances maintainability.

#153 - Add project and patch content parameters to DiffPatchViewer. - Implement patch parsing and error handling. - Integrate diff viewing using IntelliJ's DiffManager. - Localize button labels and tooltips.

- Add support for applying patches using ApplyPatchDefaultExecutor. - Introduce file icon display and improve mouse event handling. - Remove deprecated code and unused methods.

…mponents #153 Renamed and updated the following: - `CodeBlockViewer` to `CodeBlockLang` - `DiffPatchViewer` to `DiffLangSketch` - `SketchViewer` interface to `LangSketch` - Modified related components and references accordingly. This refactor aims to harmonize naming conventions within the core module and maintain consistency with language-specific viewer components.

- Rename `CodeBlockLang` to `CodeHighlightSketch` and update its implementation. - Modify `DiffLangSketch` to handle diff display and actions. - Update `LangSketch` interface with new methods. - Change `ShirePanelView` to use `LangSketch` and handle diff code blocks.

#153 Update the SingleFileDiffLangSketch to include additional functionalities such as accepting and rejecting patches, and viewing diffs through a new dialog. The commit introduces new imports, refines existing methods, and adds a rollback action with a tooltip for reversing changes. It also modifies the resource bundle to include new messages for the added actions.

This commit cleans up the codebase by removing the unused `MyApplyPatchFromClipboardDialog` class and its companion object, along with the `ShireDiffContext` class and its related methods. These removals reduce the code size and improve maintainability by eliminating unnecessary

…e SingleFileDiffLangSketch #153 Add a new dialog class `MyApplyPatchFromClipboardDialog` to handle the application of patches from the clipboard. This includes a custom checkbox for on-the-fly analysis option. Update `SingleFileDiffLangSketch` by: - Refactoring code for better readability. - Implementing progress indicator for rollback action. - Enhancing the rollback functionality to handle exceptions. - Changing the mouse event behavior for a better UI experience.

The commit updates the `SingleFileDiffLangSketch` by replacing the complex rollback logic with a simplerUndoManager API. It also enhances the UI by improving the filepath display and enabling the rollback button based on the availability of the undo action.

…necessary code #153

Improve the UI by implementing the LangSketch interface and integrating PlantUML support. This includes: - Enhancing the SingleFileDiffView class to implement LangSketch. - Introducing LanguageSketchProvider for dynamic language sketch provision. - Adding a PlantUmlSketchProvider and PlantUmlSketch class for PlantUML file rendering within the IDE.

#153 Update build script and plugin configuration to include new toolsets for PlantUML and Mermaid diagrams, enhancing the visual representation capabilities within the IDE.

- Replace mainPanel initialization with JPanel. - Integrate TextEditor and PlantUmlSplitEditor for better preview handling. - Simplify isSupported method to always return true. - Remove unnecessary UI components and streamline the initialization process.

- Added `doneUpdateText` method to `LangSketch` and `PlantUmlSketchProvider`. - Enhanced `ShirePanelView` to dispose old components properly and conditionally update text. - Improved initialization in `PlantUmlSketchProvider` and handled preview settings.

…#153 - Updated MermaidSketchProvider and PlantUmlSketchProvider to use ExtensionLangSketch. - Modified ShirePanelView to handle ExtensionLangSketch. - Added ExtensionLangSketch interface to LanguageSketchProvider.

…153 - Refactor `setupActionBar` to accept `project` and `editor` parameters. - Add Mermaid diagram support in `ShireMarketplaceTableView`. - Update `MermaidSketchProvider` to handle Mermaid and MMD languages. - Add Mermaid plugin dependency in `gradle-241.properties`. - Extend `PlantUmlSketchProvider` to support specific UML file extensions.

- Add layout rows for Mermaid and PlantUML editors. - Enhance language detection in ShireLanguageLabelAction.

- Refactor `DiffLangSketch` to extend `ExtensionLangSketch`. - Implement `getExtensionName` method in `DiffLangSketch`. - Add new `DiffLangSketchProvider` to handle diff language sketches. - Register `DiffLangSketchProvider` in `com.phodal.shirecore.xml`. - Simplify `ShirePanelView` logic for handling different language sketches.

- Simplified method return statements using expression body. - Renamed 'filepath' to 'virtualFile' for clarity and consistency. - Added mouse event handling for file label. - Imported 'readText' extension method for VirtualFile.

- Removed LanguageSketchProvider usage from ShireMarketplaceTableView. - Enhanced SingleFileDiffView with mouseEntered event to change opacity. - Improved ShirePanelView layout by adding margin and reorganizing components.

…153 - Modify various LangSketch implementations to include origin language in updateLanguage method. - Update CodeHighlightSketch to handle textLanguage. - Extend DiffLangSketch to support patch files and improve diff handling. - Adjust LangSketch interface and related providers for consistent language updates.

- Add support for a preview dialog in the diff viewer. - Import necessary classes and modify the initialization logic. - Integrate `FileEditorProvider` and `DialogWrapper` to display diff content.

Renames and reorganizes files and packages from `com.phodal.shirecore.ui` to `com.phodal.shirecore.sketch` to better reflect their purpose and improve code organization. This includes renaming several Kotlin files and updating corresponding package declarations and imports.

Updated UI component styling and layout to enhance consistency and readability. Modifications include adjusting borders, backgrounds, and alignment for various panels and labels within the code highlighting and diff views.

…leView #153 Adds the functionality to display patch content and associated action buttons within the ShireMarketplaceTableView. This includes a view for the patch content and the implementation of action buttons for file diff operations, such as rollback, enhancing the user interface for managing code patches.

Remove redundant color updates for actions in SingleFileDiffView. This change enhances the visual clarity by simplifying the color change logic when the mouse enters or exits the diff view. Only the foreground and file panel background colors are updated, improving performance and readability.

… methods #153 Deleted unnecessary diff action files and streamlined the `createSketch` methods within various sketch providers by removing redundant code and simplifying the function signatures. This change enhances code readability and maintainability.

This commit introduces a new StreamDiff class and its corresponding test suite. StreamDiff is capable of comparing two streams of text lines and emitting diff lines (New, Old, or Same) to represent the differences. The test suite ensures that the functionality handles various scenarios, including no match found, perfect matches, and matches with slight variations, including indentation differences.

…g prefix #153 This commit introduces an additional test case in `CodeFenceTest.kt` to verify that the `CodeFence.parse` method correctly handles the parsing of an incomplete code block when a language prefix (e.g., `java`) is provided. The test ensures that the parser identifies the code block as incomplete and does not mistake it for a complete block.

#153 Avoid including unnecessary new line characters when constructing CodeFence objects with empty code content. This ensures that the content remains clean and as expected.

- Replaced AssertJ with JUnit Assert for consistency. - Simplified test cases for clarity. - Implemented LCS-based diff algorithm for improved accuracy. - Removed redundant matchLine function and MatchResult class. - Updated tests to cover new edge cases.

#153 - Refactor `StreamDiffTest.kt` and `DiffStreamHandler.kt` for better flow handling. - Add `toDiffLineType()` method to `DiffLine` class in `StreamDiff.kt` for type conversion. - Ensure `lastLineNo` update is correctly placed in `DiffStreamHandler.kt`. - Enhance progress highlighter update logic.

Update the logic for selecting new and old lines in DiffStreamHandler to ensure correct sublists are created based on line numbers.

Added Apache License 2.0 headers to core diff module files to ensure compliance with licensing requirements.

Remove the DiffLineType enum and directly use DiffLine sealed class in related functions to streamline diff handling logic.

…abels #153 - Simplified button creation by directly specifying labels and colors. - Removed OS-specific key label functions and enum. - Updated button foreground color to use Gray utility class.

- Added a new project service `DiffStreamService` to the IntelliJ plugin extensions in `com.phodal.shirecore.xml`.

Refactors the diff handling logic in `DiffStreamHandler.kt` by extracting the `when` block into a new function `updateByDiffType` for better readability and simplifies conditional checks using single-line returns.

- Introduce new StreamDiff interaction type for real-time diff streaming. - Update button labels using ShireCoreBundle for localization. - Refactor task creation and handling in EditorInteractionProvider. - Add new documentation for Shire Sketch and update language spec order. - Enhance DiffStreamHandler to support response handling.

phodal added a commit that referenced this issue Dec 8, 2024

feat(toolbar): add ShireDiffCodeAction #153

74d995a

- Introduce new action `ShireDiffCodeAction` for code diffing in the toolbar. - Add corresponding XML configuration and Kotlin class.

phodal changed the title ~~Multi-file edits~~ Shire Skecth: A Multi-file viewer, render and edit Dec 8, 2024

phodal added a commit that referenced this issue Dec 10, 2024

refactor(viewer): rename and restructure viewer components, remove un…

6d1a3e6

…necessary code #153

phodal added a commit that referenced this issue Dec 10, 2024

feat(toolsets): add mermaid support and integration plugin #153

55e33d0

phodal added a commit that referenced this issue Dec 10, 2024

chore(toolsets): add PlantUML and Mermaid support

4fb6e0f

#153 Update build script and plugin configuration to include new toolsets for PlantUML and Mermaid diagrams, enhancing the visual representation capabilities within the IDE.

phodal added a commit that referenced this issue Dec 10, 2024

refactor(editor): improve layout and language handling #153

3be1782

- Add layout rows for Mermaid and PlantUML editors. - Enhance language detection in ShireLanguageLabelAction.

phodal added a commit that referenced this issue Dec 11, 2024

feat(diff): add diff streaming support for editors #153

f2014bc

phodal added a commit that referenced this issue Dec 11, 2024

fix(diff): correct line selection logic in DiffStreamHandler #153

511f7f1

Update the logic for selecting new and old lines in DiffStreamHandler to ensure correct sublists are created based on line numbers.

phodal added a commit that referenced this issue Dec 11, 2024

chore(core): add Apache 2.0 license headers #153

1eb17a5

Added Apache License 2.0 headers to core diff module files to ensure compliance with licensing requirements.

phodal added a commit that referenced this issue Dec 12, 2024

refactor(diff): simplify DiffLineType handling #153

6a8f6d3

Remove the DiffLineType enum and directly use DiffLine sealed class in related functions to streamline diff handling logic.

phodal added a commit that referenced this issue Dec 12, 2024

feat(extensions): add DiffStreamService project service #153

d8cb1b0

- Added a new project service `DiffStreamService` to the IntelliJ plugin extensions in `com.phodal.shirecore.xml`.

phodal closed this as completed Dec 12, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Shire Skecth: A Multi-file viewer, render and edit #153

Shire Skecth: A Multi-file viewer, render and edit #153

phodal commented Dec 2, 2024 •

edited

Loading

OiAnthony commented Dec 3, 2024

Shire Skecth: A Multi-file viewer, render and edit #153

Shire Skecth: A Multi-file viewer, render and edit #153

Comments

phodal commented Dec 2, 2024 • edited Loading

Sketch

Diff Sketch

Mermaid Sketch

PlantUML Sketch

Error Handling (TBC)

OiAnthony commented Dec 3, 2024

phodal commented Dec 2, 2024 •

edited

Loading