Skip to content

Commit

Permalink
Merge branch 'main' into renovate/tsx-4.x-lockfile
Browse files Browse the repository at this point in the history
  • Loading branch information
thelooter authored Nov 13, 2024
2 parents e414365 + 6564023 commit ebfce79
Show file tree
Hide file tree
Showing 26 changed files with 897 additions and 437 deletions.
16 changes: 3 additions & 13 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,13 @@ end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

# go
[*.go]
indent_style = tab
indent_size = 4

# python
[*.{ini,py,py.tpl,rst,kt,kts}]
indent_size = 4

# rust
[*.rs]
indent_size = 4

# documentation, utils
[*.{md,mdx,diff}]
trim_trailing_whitespace = false

# windows shell scripts
[*.{cmd,bat,ps1}]
end_of_line = crlf

[*.{kt,kts}]
ij_kotlin_name_count_to_use_star_import = 2147483647
9 changes: 8 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,14 @@ jobs:
- name: Generate Icons
run: pnpm build

- name: Build Plugin
- name: Check Formatting
run: ./gradlew checkFormatting

- name: Run Static Analysis
run: ./gradlew runStaticAnalysis
continue-on-error: true

- name: Test & Build Plugin
run: ./gradlew buildPlugin

- name: Upload JAR(s)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Patch Changelog
run: ./gradlew patchChangelog

- name: Build Plugin
- name: Test & Build Plugin
run: ./gradlew buildPlugin

- name: Upload JAR
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ build/
!**/src/test/**/build/

### IntelliJ IDEA ###
.idea
.idea/*
.intellijPlatform
*.iws
*.iml
*.ipr
out/
!**/src/main/**/out/
!**/src/test/**/out/
!.idea/ktfmt.xml

### Eclipse ###
.apt_generated
Expand Down
7 changes: 7 additions & 0 deletions .idea/ktfmt.xml

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

39 changes: 29 additions & 10 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,28 @@

### Changed

- Add code formatting with ktfmt
- Add static analysis with detekt
- Add tests

### Deprecated

### Removed

### Fixed

- Fixed K2 compatibility warning

### Security

## 1.10.0 - 2024-10-13

### Added

- Add icon for `.razor` files.
- Upgrade submodule `vscode-icons` from v1.16.0 to v1.17.0 (See [vscode-icons CHANGELOG.md](https://github.com/catppuccin/vscode-icons/blob/main/CHANGELOG.md#v1170) for added icons and associations)
- Upgrade submodule `vscode-icons` from v1.16.0 to v1.17.0 (
See [vscode-icons CHANGELOG.md](https://github.com/catppuccin/vscode-icons/blob/main/CHANGELOG.md#v1170) for added
icons and associations)

### Changed

Expand All @@ -37,10 +45,14 @@

### Fixed

- Fix plugin defect warnings by optionally loading Java icons ([#116](https://github.com/catppuccin/jetbrains-icons/pull/116))
- Visibility Icons for Java Files are not hidden anymore ([#116](https://github.com/catppuccin/jetbrains-icons/pull/116))
- Static Classes for Java files now have the appropriate Static Mark ([#116](https://github.com/catppuccin/jetbrains-icons/pull/116))
- Accurately apply `Exception` icon on all classes extending `Exception` and `Throwable` ([#116](https://github.com/catppuccin/jetbrains-icons/pull/116))
- Fix plugin defect warnings by optionally loading Java
icons ([#116](https://github.com/catppuccin/jetbrains-icons/pull/116))
- Visibility Icons for Java Files are not hidden
anymore ([#116](https://github.com/catppuccin/jetbrains-icons/pull/116))
- Static Classes for Java files now have the appropriate Static
Mark ([#116](https://github.com/catppuccin/jetbrains-icons/pull/116))
- Accurately apply `Exception` icon on all classes extending `Exception` and
`Throwable` ([#116](https://github.com/catppuccin/jetbrains-icons/pull/116))

## 1.8.0 - 2024-09-13

Expand All @@ -49,19 +61,24 @@
- Differentiate Java files (Annotation, Class, Enum, etc.) by colour and shape in the file tree. If you know how to
implement these icons in the rest of the user interface, please reach out to us via the issue tracker or the
Catppuccin discord!
- Upgrade submodule `vscode-icons` from v1.15.0 to v1.16.0 (See [vscode-icons CHANGELOG.md](https://github.com/catppuccin/vscode-icons/blob/main/CHANGELOG.md#v1160) for added icons and associations)
- Upgrade submodule `vscode-icons` from v1.15.0 to v1.16.0 (
See [vscode-icons CHANGELOG.md](https://github.com/catppuccin/vscode-icons/blob/main/CHANGELOG.md#v1160) for added
icons and associations)

## 1.7.0 - 2024-09-08

### Added

- Upgrade submodule `vscode-icons` from v1.13.0 to v1.15.0 (See [vscode-icons CHANGELOG.md](https://github.com/catppuccin/vscode-icons/blob/main/CHANGELOG.md#v1150) for added icons and associations)
- Upgrade submodule `vscode-icons` from v1.13.0 to v1.15.0 (
See [vscode-icons CHANGELOG.md](https://github.com/catppuccin/vscode-icons/blob/main/CHANGELOG.md#v1150) for added
icons and associations)

## 1.6.2 - 2024-08-13

### Fixed

- Make `org.jetbrains.kotlin` and `com.intellij.java` modules optional. This reintroduces support for IDEs outside IntelliJ, Android Studio & Aqua. ([#86](https://github.com/catppuccin/jetbrains-icons/pull/86))
- Make `org.jetbrains.kotlin` and `com.intellij.java` modules optional. This reintroduces support for IDEs outside
IntelliJ, Android Studio & Aqua. ([#86](https://github.com/catppuccin/jetbrains-icons/pull/86))

## 1.6.1 - 2024-08-09

Expand Down Expand Up @@ -102,8 +119,10 @@

- Different colors for Java filetypes (e.g. `Class`: Red, `Interface`: Green, `Record`: Mauve, `Enum`:
Yellow and `Annotation`: Green) ([#35](https://github.com/catppuccin/jetbrains-icons/pull/35))
- Ability to disable different colors for Java filetypes in settings panel. ([#35](https://github.com/catppuccin/jetbrains-icons/pull/35))
- Add Docker icon to all files with string `Dockerfile` (e.g. `dev.Dockerfile`) ([#32](https://github.com/catppuccin/jetbrains-icons/pull/32))
- Ability to disable different colors for Java filetypes in settings
panel. ([#35](https://github.com/catppuccin/jetbrains-icons/pull/35))
- Add Docker icon to all files with string `Dockerfile` (e.g.
`dev.Dockerfile`) ([#32](https://github.com/catppuccin/jetbrains-icons/pull/32))
- Add Dependency on the IntelliJ Java Module ([#40](https://github.com/catppuccin/jetbrains-icons/pull/40))

## 1.4.0 - 2024-02-27
Expand Down
Loading

0 comments on commit ebfce79

Please sign in to comment.