Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wrap code editor for template selector #21104

Merged
merged 3 commits into from
Jun 17, 2024
Merged

Wrap code editor for template selector #21104

merged 3 commits into from
Jun 17, 2024

Conversation

bramkragten
Copy link
Member

@bramkragten bramkragten commented Jun 17, 2024

Proposed change

Wraps lines in the code editor for the template selector

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New feature (thank you!)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Example configuration

Additional information

  • This PR fixes or closes issue: fixes #
  • This PR is related to issue or discussion:
  • Link to documentation pull request:

Checklist

  • The code change is tested and works locally.
  • There is no commented out code in this PR.
  • Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

Summary by CodeRabbit

  • New Features
    • Added line wrapping functionality to the code editor for enhanced code readability.
    • Introduced wrap and linewrap attributes to the code editor component, allowing users to toggle line wrapping on or off.

Copy link
Contributor

coderabbitai bot commented Jun 17, 2024

Walkthrough

Walkthrough

This update introduces wrap and linewrap properties to the HaCodeEditor class, enabling line wrapping functionality. These properties are integrated into the HaTemplateSelector class, affecting the ha-code-editor element. Additionally, a new linewrapCompartment constant is added to codemirror.ts, allowing more configurable editor behaviors.

Changes

File Path Change Summary
.../ha-code-editor.ts Added wrap and linewrap boolean properties to HaCodeEditor class.
.../ha-selector-template.ts Added wrap and linewrap attributes to ha-code-editor in HaTemplateSelector.
.../resources/codemirror.ts Introduced linewrapCompartment constant.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant HaTemplateSelector
    participant HaCodeEditor
    participant CodeMirror

    User->>HaTemplateSelector: Initialize HaTemplateSelector with linewrap
    HaTemplateSelector->>HaCodeEditor: Create ha-code-editor with linewrap attribute
    HaCodeEditor->>CodeMirror: Initialize editor with linewrapCompartment
    CodeMirror-->>HaCodeEditor: Editor ready with line wrapping
    HaCodeEditor-->>HaTemplateSelector: ha-code-editor initialization complete
    HaTemplateSelector-->>User: Selector ready with updated code editor
Loading

Recent review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE

Commits

Files that changed from the base of the PR and between 01e74b5 and 8f557c0.

Files selected for processing (1)
  • src/components/ha-selector/ha-selector-template.ts (1 hunks)
Additional comments not posted (3)
src/components/ha-selector/ha-selector-template.ts (3)

35-35: Ensure proper attribute usage for linewrap in the ha-code-editor element.

It's good to see that the linewrap attribute is correctly implemented as per the PR description. Ensure that this attribute is handled appropriately in the ha-code-editor component.


Line range hint 48-54: Review the change handling logic in _handleChange.

The method _handleChange correctly updates the component state only when the value actually changes, which is efficient. This prevents unnecessary updates and events from being fired.


Line range hint 15-43: Review overall rendering logic.

The rendering logic is clean and well-structured. The use of conditional rendering for labels and helper texts is effective and makes the code more readable. The integration of ha-code-editor with dynamic properties and methods is properly handled.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Outside diff range comments (2)
src/components/ha-code-editor.ts (2)

Line range hint 107-107: Consider replacing non-null assertions with optional chaining.

Non-null assertions can lead to runtime errors if not handled properly. Consider replacing them with optional chaining (?.) to improve code safety and robustness.

- this.codemirror!.destroy();
+ this.codemirror?.destroy();

Also applies to: 127-127, 134-134, 135-135, 141-141, 142-142, 164-164, 252-252


Line range hint 108-108: Avoid using the delete operator.

Using the delete operator can lead to performance issues. It's better to set properties to undefined to allow for better optimization by JavaScript engines.

- delete this.codemirror;
+ this.codemirror = undefined;

silamon
silamon previously approved these changes Jun 17, 2024
Copy link
Contributor

@silamon silamon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm just wondering why you didn't make it linewrap as attribute.

@bramkragten
Copy link
Member Author

I'm just wondering why you didn't make it linewrap as attribute.

🤷‍♂️ if you think that's better I can change it to that 👍

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 3

Outside diff range comments (1)
src/components/ha-code-editor.ts (1)

Line range hint 108-108: Replace the delete operator with setting to undefined to improve performance.

- delete this.codemirror;
+ this.codemirror = undefined;

Using delete on properties can degrade performance by hindering JavaScript engine optimizations. Setting the property to undefined is generally a better practice.

@@ -47,6 +47,8 @@ export class HaCodeEditor extends ReactiveElement {

@property({ type: Boolean }) public readOnly = false;

@property({ type: Boolean }) public linewrap = false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a brief comment describing the purpose of the linewrap property.

Adding a comment above this property will improve code readability and maintainability, helping future developers understand its use more quickly.

Comment on lines +193 to +195
this._loadedCodeMirror.linewrapCompartment.of(
this.linewrap ? this._loadedCodeMirror.EditorView.lineWrapping : []
),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ensure the use of non-null assertions is safe here.

- this._loadedCodeMirror!.linewrapCompartment!.of(
+ this._loadedCodeMirror?.linewrapCompartment?.of(

As previously noted, using non-null assertions without checks can lead to runtime issues. Optional chaining should be used instead to ensure the code is robust against null values.

Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
this._loadedCodeMirror.linewrapCompartment.of(
this.linewrap ? this._loadedCodeMirror.EditorView.lineWrapping : []
),
this._loadedCodeMirror?.linewrapCompartment?.of(
this.linewrap ? this._loadedCodeMirror.EditorView.lineWrapping : []
),

Comment on lines +139 to +145
if (changedProps.has("linewrap")) {
transactions.push({
effects: this._loadedCodeMirror!.linewrapCompartment!.reconfigure(
this.linewrap ? this._loadedCodeMirror!.EditorView.lineWrapping : []
),
});
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ensure the use of non-null assertions is safe here.

- this._loadedCodeMirror!.linewrapCompartment!.reconfigure(
+ this._loadedCodeMirror?.linewrapCompartment?.reconfigure(

The non-null assertion operator (!) is used multiple times, which can lead to runtime errors if this._loadedCodeMirror or linewrapCompartment is null. Consider replacing it with optional chaining (?.) to make the code safer.

Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
if (changedProps.has("linewrap")) {
transactions.push({
effects: this._loadedCodeMirror!.linewrapCompartment!.reconfigure(
this.linewrap ? this._loadedCodeMirror!.EditorView.lineWrapping : []
),
});
}
if (changedProps.has("linewrap")) {
transactions.push({
effects: this._loadedCodeMirror?.linewrapCompartment?.reconfigure(
this.linewrap ? this._loadedCodeMirror?.EditorView.lineWrapping : []
),
});
}
Tools
Biome

[error] 141-141: Forbidden non-null assertion. (lint/style/noNonNullAssertion)

Unsafe fix: Replace with optional chain operator ?. This operator includes runtime checks, so it is safer than the compile-only non-null assertion operator


[error] 141-141: Forbidden non-null assertion. (lint/style/noNonNullAssertion)

Unsafe fix: Replace with optional chain operator ?. This operator includes runtime checks, so it is safer than the compile-only non-null assertion operator


[error] 142-142: Forbidden non-null assertion. (lint/style/noNonNullAssertion)

Unsafe fix: Replace with optional chain operator ?. This operator includes runtime checks, so it is safer than the compile-only non-null assertion operator

Co-authored-by: Simon Lamon <32477463+silamon@users.noreply.github.com>
@silamon silamon enabled auto-merge (squash) June 17, 2024 19:06
@silamon silamon merged commit 27afe9e into dev Jun 17, 2024
9 checks passed
@silamon silamon deleted the wrap-template-selector branch June 17, 2024 19:15
@frenck frenck added the Noteworthy Marks a PR as noteworthy and should be in the release notes (in case it normally would not appear) label Jun 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed Noteworthy Marks a PR as noteworthy and should be in the release notes (in case it normally would not appear)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants