File tree Expand file tree Collapse file tree 2 files changed +3
-1
lines changed
src/main/kotlin/glsl/plugin/utils Expand file tree Collapse file tree 2 files changed +3
-1
lines changed Original file line number Diff line number Diff line change 18
18
- Templates triggering inside include string autocompletion
19
19
- Custom functions in autocomplete
20
20
- Autocompletion for functions/variables in front of existing statements
21
+ - Recursive included structs from builtins
21
22
22
23
# Changed
23
24
- Minimum IntelliJ version is now 2023.3
Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ import com.intellij.openapi.project.ProjectManager
4
4
import com.intellij.psi.PsiFileFactory
5
5
import com.intellij.psi.util.PsiTreeUtil.findChildOfType
6
6
import com.intellij.psi.util.PsiTreeUtil.findChildrenOfType
7
+ import com.intellij.psi.util.findParentOfType
7
8
import glsl.data.ShaderType
8
9
import glsl.data.ShaderType.*
9
10
import glsl.plugin.language.GlslFile
@@ -111,7 +112,7 @@ object GlslBuiltinUtils {
111
112
*/
112
113
private fun setShaderVariables () {
113
114
val shaderVariablesFile = getBuiltinFile(" glsl-shader-variables" )
114
- val structSpecifiers = findChildrenOfType(shaderVariablesFile, GlslStructSpecifier ::class .java).toList()
115
+ val structSpecifiers = findChildrenOfType(shaderVariablesFile, GlslStructSpecifier ::class .java).filter { it.findParentOfType< GlslStructSpecifier >() == null }. toList()
115
116
// Initializes map with ShaderType enum
116
117
shaderVariables = EnumMap (ShaderType ::class .java)
117
118
val allShaderVariables = hashMapOf<String , GlslNamedVariable >()
You can’t perform that action at this time.
0 commit comments