Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/stable'
Browse files Browse the repository at this point in the history
# Conflicts:
#	build.gradle.kts
  • Loading branch information
Peter Vanusanik committed Jun 30, 2023
2 parents 802c65d + b793a24 commit 68bfede
Show file tree
Hide file tree
Showing 44 changed files with 1,246 additions and 102 deletions.
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
## 0.5.2

### Added
- Refactor - extract lambda to function
- Refactor - rename symbol
- Swank action - disassemble
- Swank action - undefine function
- Swank action - unintern symbol function
- Swank action - reevalute defvar

### Changes

### Fixes
- Fixed indentation issues
- Fixed symbol parsing - |123| reported as number
- Fixed #88, #83

## 0.5.1 230508

### Added
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ You can also open this as a project in Intellij Idea.
* [x] Back references
* [x] Rainbow braces
* [ ] Refactoring
* [x] Extracting lambda to function
* [ ] List of quicklisp installed packages / ASDF packages
* [ ] List of modified top level forms that are yet to be evaluated
* [ ] Actually make an IDE, ie just plugin with dependencies as one application, not a plugin
Expand Down
4 changes: 2 additions & 2 deletions build-distributions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ export PRIVATE_KEY_PASSWORD=$PASSWORD

expandedName() (
# shellcheck disable=SC2125
UNEXPANDED=build/distributions/slt-*-signed.zip
UNEXPANDED=build/distributions/slt-signed.zip
set +f
echo $UNEXPANDED
)

DISTRIBUTIONS="CL GO IC IU PY PC RD"
DISTRIBUTIONS="IC"
for TARGET_IDE in ${DISTRIBUTIONS}; do
echo Trying to build $TARGET_IDE
export TARGET_IDE=$TARGET_IDE
Expand Down
3 changes: 1 addition & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

group = "com.en_circle.slt"
version = "0.5.1.1"
version = "0.5.2"

idea {
module {
Expand All @@ -21,7 +21,6 @@ repositories {
dependencies {
implementation("org.awaitility:awaitility:4.2.0")
implementation("org.watertemplate:watertemplate-engine:1.2.2")
implementation("com.google.guava:guava:32.1.0-jre")
implementation("org.rauschig:jarchivelib:1.2.0")
implementation("org.jsoup:jsoup:1.16.1")

Expand Down
4 changes: 2 additions & 2 deletions src/main/gen/com/en_circle/slt/plugin/lisp/LispLexer.java

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

16 changes: 14 additions & 2 deletions src/main/gen/com/en_circle/slt/plugin/lisp/LispParser.java

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

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

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

4 changes: 4 additions & 0 deletions src/main/gen/com/en_circle/slt/plugin/lisp/psi/LispTypes.java

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

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

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
public class SltIconProvider {

public static final Icon file = IconLoader.getIcon("/icons/fileicon.svg", SltIconProvider.class);
public static final Icon swank = IconLoader.getIcon("/icons/swank.svg", SltIconProvider.class);
public static final Icon sbcl = IconLoader.getIcon("/icons/sbcl.png", SltIconProvider.class);

public static final Icon darkTheme = IconLoader.getIcon("/icons/darkTheme.svg", SltIconProvider.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public void actionPerformed(@NotNull AnActionEvent event) {
JBPopup popup = JBPopupFactory.getInstance()
.createComponentPopupBuilder(textPanel, null)
.setProject(editor.getProject())
.setTitle(SltBundle.message("slt.documentation.macroexpand"))
.setTitle(SltBundle.message("slt.ui.macroexpand.title"))
.setShowBorder(true)
.setMovable(true)
.setFocusable(true)
Expand Down
Loading

0 comments on commit 68bfede

Please sign in to comment.