Skip to content

Multiple bugfixes#47

Closed
FalsePattern wants to merge 37 commits intormordechay:mainfrom
FalsePattern:main
Closed

Multiple bugfixes#47
FalsePattern wants to merge 37 commits intormordechay:mainfrom
FalsePattern:main

Conversation

@FalsePattern
Copy link
Copy Markdown
Contributor

@FalsePattern FalsePattern commented Jan 14, 2025 •
edited
Loading

Superseded by:
#51
#52
#53
#54

@FalsePattern
updated gradle, modernized build.gradle, added config cache support
5ad29db
@FalsePattern
fix GlslFormatterTest failing on linux (case sensitive files)
0db402b
@FalsePattern
update gitignore
c9e4dfd
@FalsePattern
use IJ GeneratedParserUtil
bd5e51a
@FalsePattern
fixed incorrect swizzle constants in glsl-vector-structs
1859c7a
@FalsePattern
added support for recursive relative includes
cb85067
@FalsePattern
added support for OptiFine shaderpack absolute path includes
a946fe0
@FalsePattern
fix identifier macro state leak in helper lexer
58a4092
@FalsePattern
recursive includes for lexer type resolution
785d40f
@FalsePattern
matrix * vector returns vector
07ce855
@FalsePattern
added compatibility profile uniforms from khronos spec
5c6dee9
@FalsePattern
fixed struct member vector array index type resolution
f2e6191
@FalsePattern
Compat with 2023.3
23b9460
@FalsePattern
add ftransform() builtin func
933d222
@FalsePattern
add intellij completion dummy to parser and lexer
913433e
@FalsePattern
GlslGenericCompletion whitespace-aware
c2bea6a
@FalsePattern
better #version autocomplete
dc804ec
@FalsePattern
set a temporary dev version for the changelog
57a100c
@FalsePattern
update readme
5326334
@FalsePattern
Revert "add intellij completion dummy to parser and lexer"
79a3636 
This reverts commit 913433e.
@FalsePattern
fixed cross-file custom struct member completions
bed3874
@FalsePattern
way more useful include completions
938bcdf
@FalsePattern
fix templates in include strings
caf06f5
@FalsePattern
fix custom functions not showing in autocomplete
6a8fec0
@FalsePattern
proper function autocompletion
0ba4abc
@FalsePattern
fix inconsistent state in VariableReference
3c8a6e7
@FalsePattern
fix inconsistent state in TypeReference
24e4a12
@FalsePattern
fix autocomplete in front of statement lines
f4a8eb3
@FalsePattern
fix a TODO crash that can sometimes happen
82b2a71
@FalsePattern
fix builtin function autocomplete in unfinished statements
a1d243b
@rmordechay
Copy link
Copy Markdown
Owner

rmordechay commented Jan 17, 2025

@FalsePattern great work!
Unfortunately I won't have time this weekend nor next week. I will try to find time next weekend.
I had a quick look at the PR and it seems like you did much needed changes. Thx.

@FalsePattern
Copy link
Copy Markdown
Contributor Author

FalsePattern commented Jan 29, 2025

Added 2 more minor highlighting fixes, the text attribute change should make light theme automatic default colors a bit nicer

@FalsePattern
Copy link
Copy Markdown
Contributor Author

FalsePattern commented Feb 5, 2025 •
edited
Loading

I improved the "shaderpack absolute path" hack a little bit, now there's a way to also use it in non-Minecraft projects via a marker file (.glsl_idea_root) in the "root folder" of the shader code. I wanted to do it via source sets, but that just adds way too much IDE jank to a simple problem.

I added a section to the end of the readme so that users know about it:
image

@rmordechay
Copy link
Copy Markdown
Owner

rmordechay commented Feb 23, 2025

@FalsePattern
I didn't forget you PR. I have no time to look into this. Unfortunately I think I will have time only next week or so.

@rmordechay
Copy link
Copy Markdown
Owner

rmordechay commented Mar 3, 2025

I don't mind changing stuff but I guess we should discuss that before changing. There are some things that I chose with purpose, and also, it made the PR hard to review as it became pretty big. So there are some things that I would like to have as they were for this PR, and if you want/need some changes then please make a separate PR:

  1. Please revert Gradle and in general all the build changes. If there are some good reasons to change them, let's do it in a different PR.
  2. Please move grammar dir to its original location. I know it doesn't resolve in the grammar but I think such important files should be in the root path. It helps for navigation.
  3. Revert to the original GeneratedParserUtil.java. It has logic that the original file doesn't have.

rmordechay
rmordechay reviewed Mar 3, 2025
View reviewed changes
Comment thread README.md
```
Assuming you're developing with Intellij (and you want to develop with Intellij):
1. **Generate grammar**. Execute the `generateGrammarClean` task from _gradle.build_ file or under _Tasks/other_ if you use the Gradle tab.
1. **Generate grammar**. Execute the `generateGrammars` task from _gradle.build_ file or under _Tasks/grammarkit_ if you use the Gradle tab.
Copy link
Copy Markdown
Owner

@rmordechay rmordechay Jan 29, 2025

Choose a reason for hiding this comment

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

What's the reason to change the name?

Comment thread CHANGELOG.md
@@ -1,4 +1,28 @@
# GLSL Plugin Changelog
## [Unreleased]
Copy link
Copy Markdown
Owner

@rmordechay rmordechay Jan 29, 2025

Choose a reason for hiding this comment

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

You could already put the next version here, 1.1.5

Comment thread src/main/kotlin/glsl/plugin/completion/GlslCompletionProvider.kt
}

/**
/**2
Copy link
Copy Markdown
Owner

@rmordechay rmordechay Mar 3, 2025

Choose a reason for hiding this comment

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

i assume the '2' is a mistake

Comment thread gradle.properties
@@ -1,2 +1,7 @@
pluginVersion=1.1.4
pluginVersion=1.1.5-dev
Copy link
Copy Markdown
Owner

@rmordechay rmordechay Mar 3, 2025

Choose a reason for hiding this comment

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

There should be no dev versions. Just put 1.1.5 for the next version.

Comment thread src/main/kotlin/glsl/plugin/psi/GlslExprType.kt
private fun getPostfixSelectionType(`postfixExpr`: GlslPostfixFieldSelection): GlslNamedType? {
if (postfixExpr.postfixStructMemberList.isEmpty()) return null
val lastExpr = postfixExpr.postfixStructMemberList.last()
if (lastExpr.variableIdentifier == null)
Copy link
Copy Markdown
Owner

@rmordechay rmordechay Mar 3, 2025

Choose a reason for hiding this comment

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

All if's in the project have parenthesis

@FalsePattern FalsePattern marked this pull request as draft March 4, 2025 22:59
@FalsePattern
Copy link
Copy Markdown
Contributor Author

FalsePattern commented Mar 4, 2025

I'll split this PR into smaller ones and undo the buildscript changes either this weekend or a few weeks after, i don't have a lot of free time at the moment

This was referenced Mar 6, 2025
Merged
Merged
Open
Merged
@FalsePattern
Copy link
Copy Markdown
Contributor Author

FalsePattern commented Mar 6, 2025

PR split map:
image

Legend:
Blue - #51
Green - #52
Red - #53
Magenta - #54
White - dropped

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rmordechay rmordechay rmordechay left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@FalsePattern @rmordechay