GramEditor/gram
37
982
Fork
You've already forked gram
88

Cleanup and formatting #356

Open
koru wants to merge 14 commits from koru/cleanup into main AGit
pull from: koru/cleanup
merge into: GramEditor:main
GramEditor:main
GramEditor:test/wgpu-on-mac
GramEditor:test-ci/failing-test-mac
GramEditor:test/failing-test-mac
GramEditor:test/build-on-22-04
GramEditor:test/wgpu-present-mode-mailbox
GramEditor:v2.1
GramEditor:test/altgr-fix-again
GramEditor:test/2.0.0-rc1
GramEditor:test/linux-build
GramEditor:test/objc2
GramEditor:v1.2.1
Contributor
Copy link
  • Set 2 indent for instead 4. See: https://github.com/tombi-toml/tombi/issues/1204#issuecomment-3511803336
  • .editorconfig: add more rules.
  • .gitignore: merge /docs/ and /extensions/ rules
  • .gitattributes: update stats
  • prettier: move to /
  • rust: rename rustfmt, update indent, add scheme
  • README.md: delete distro-specific, redirect to /docs/linux.md, move preview, add some rules to rustfmt.toml. Almost all rust-* changes based on: https://github.com/rust-lang/rust
  • md: formatting, rename from jsonc to json. I think it's better for
    code blocks; rename from TBD to TODO
  • Delete /assets/themes/.gitkeep
  • Delete /debug.plist. I think this file isn't work
- Set 2 indent for instead 4. See: https://github.com/tombi-toml/tombi/issues/1204#issuecomment-3511803336 - .editorconfig: add more rules. - .gitignore: merge `/docs/` and `/extensions/` rules - .gitattributes: update stats - prettier: move to `/` - rust: rename rustfmt, update indent, add scheme - README.md: delete distro-specific, redirect to `/docs/linux.md`, move preview, add some rules to `rustfmt.toml`. Almost all rust-* changes based on: https://github.com/rust-lang/rust - md: formatting, rename from `jsonc` to `json`. I think it's better for code blocks; rename from `TBD` to `TODO` - Delete `/assets/themes/.gitkeep` - Delete `/debug.plist`. I think this file isn't work 
- Set 2 indent for instead 4. See:
https://github.com/tombi-toml/tombi/issues/1204#issuecomment-3511803336
- .editorconfig: add more rules.
- .gitignore: merge `/docs/` and `/extensions/` rules
- .gitattributes: update stats
- prettier: move to `/`
- rust: rename rustfmt, update indent, add scheme
- README.md: delete distro-specific, redirect to `/docs/linux.md`, move
preview, add some rules to `rustfmt.toml`. Almost all rust-* changes
based on: https://github.com/rust-lang/rust
- md: formatting, rename from `jsonc` to `json`. I think it's better for
code blocks; rename from `TBD` to `TODO`
- Delete `/assets/themes/.gitkeep`
- Delete `/debug.plist`. I think this file isn't work
Author
Contributor
Copy link

It's also ok to ignore this commit at blame using .git-blame-ignore-revs.

It's also ok to ignore this commit at blame using [.git-blame-ignore-revs](https://codeberg.org/GramEditor/gram/src/branch/main/.git-blame-ignore-revs).
Author
Contributor
Copy link

My LSP and Formatter settings:

> hx --health markdown
Configured language servers:
 ✓ markdown-oxide
Configured formatter:
 ✓ prettier
> hx --health toml
Configured language servers:
 ✓ tombi
> hx --health rust
Configured language servers:
 ✓ rust-analyzer
Configured formatter:
 ✓ bash
My LSP and Formatter settings: ```console > hx --health markdown Configured language servers: ✓ markdown-oxide Configured formatter: ✓ prettier > hx --health toml Configured language servers: ✓ tombi > hx --health rust Configured language servers: ✓ rust-analyzer Configured formatter: ✓ bash ```
Owner
Copy link

Hi!

I took a quick glance at this PR, and I feel like it's a bit hard to review. I don't quite understand some of the changes, but it's hard to figure out which changes belong together when it's all one big commit. Could you try to split it into smaller commits perhaps?

Hi! I took a quick glance at this PR, and I feel like it's a bit hard to review. I don't quite understand some of the changes, but it's hard to figure out which changes belong together when it's all one big commit. Could you try to split it into smaller commits perhaps?
Author
Contributor
Copy link

@krig wrote in #356 (comment):

Hi!

I took a quick glance at this PR, and I feel like it's a bit hard to review. I don't quite understand some of the changes, but it's hard to figure out which changes belong together when it's all one big commit. Could you try to split it into smaller commits perhaps?

Sure!

@krig wrote in https://codeberg.org/GramEditor/gram/pulls/356#issuecomment-18258800: > Hi! > > I took a quick glance at this PR, and I feel like it's a bit hard to review. I don't quite understand some of the changes, but it's hard to figure out which changes belong together when it's all one big commit. Could you try to split it into smaller commits perhaps? Sure!
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin +refs/pull/356/head:koru/cleanup
git switch koru/cleanup

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff koru/cleanup
git switch koru/cleanup
git rebase main
git switch main
git merge --ff-only koru/cleanup
git switch koru/cleanup
git rebase main
git switch main
git merge --no-ff koru/cleanup
git switch main
git merge --squash koru/cleanup
git switch main
git merge --ff-only koru/cleanup
git switch main
git merge koru/cleanup
git push origin main
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
GramEditor/gram!356
Reference in a new issue
GramEditor/gram
No description provided.
Delete branch "koru/cleanup"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?