Merge branch '1.1.5'

Author: rmordechay

CHANGELOG.md

@@ -1,5 +1,16 @@
 # GLSL Plugin Changelog
 
+## [1.1.5]
+### Fixed
+- Iteration variable was resolved outside the iteration loop
+- Fixed Dynamic type check
+- Fixed broken swizzling for the stpq group
+- Added compatibility profile uniforms
+- Fixed nested builtin struct namespace pollution
+### Added
+- File structure view
+- Improved highlighting for light themes.
+
 ## [1.1.4]
 - Updated version
 

build.gradle

@@ -77,7 +77,6 @@ patchPluginXml {
     changeNotes = changelog.get(version.toString()).toHTML()
     pluginDescription = descriptionHtml
     sinceBuild = '223'
-    untilBuild = '243.*'
 }
 
 changelog {

gradle.properties

@@ -1,2 +1,2 @@
-pluginVersion=1.1.4
+pluginVersion=1.1.5
 kotlin.code.style=official

src/main/kotlin/glsl/plugin/features/GlslBraceMatcher.kt renamed to src/main/kotlin/glsl/plugin/editor/GlslBraceMatcher.kt

@@ -1,4 +1,4 @@
-package glsl.plugin.features
+package glsl.plugin.editor
 
 import com.intellij.codeInsight.highlighting.PairedBraceMatcherAdapter
 import com.intellij.lang.BracePair

src/main/kotlin/glsl/plugin/features/GlslCommenter.kt renamed to src/main/kotlin/glsl/plugin/editor/GlslCommenter.kt

@@ -1,4 +1,4 @@
-package glsl.plugin.features
+package glsl.plugin.editor
 
 import com.intellij.lang.Commenter
 

src/main/kotlin/glsl/plugin/features/GlslDocumentationProvider.kt renamed to src/main/kotlin/glsl/plugin/editor/GlslDocumentationProvider.kt

@@ -1,4 +1,4 @@
-package glsl.plugin.features
+package glsl.plugin.editor
 
 import com.intellij.lang.documentation.DocumentationProvider
 import com.intellij.openapi.editor.Editor

src/main/kotlin/glsl/plugin/features/GlslMultiHostInjector.kt renamed to src/main/kotlin/glsl/plugin/editor/GlslMultiHostInjector.kt

@@ -1,4 +1,4 @@
-package glsl.plugin.features
+package glsl.plugin.editor
 
 import com.intellij.codeInsight.template.TemplateActionContext
 import com.intellij.codeInsight.template.TemplateContextType

src/main/kotlin/glsl/plugin/features/GlslNewShaderFile.kt renamed to src/main/kotlin/glsl/plugin/editor/GlslNewShaderFile.kt

@@ -1,4 +1,4 @@
-package glsl.plugin.features
+package glsl.plugin.editor
 
 import com.intellij.ide.actions.CreateFileFromTemplateAction
 import com.intellij.ide.actions.CreateFileFromTemplateDialog

src/main/kotlin/glsl/plugin/features/GlslQuoteHandler.kt renamed to src/main/kotlin/glsl/plugin/editor/GlslQuoteHandler.kt

@@ -1,4 +1,4 @@
-package glsl.plugin.features
+package glsl.plugin.editor
 
 import com.intellij.codeInsight.editorActions.SimpleTokenSetQuoteHandler
 import com.intellij.psi.TokenType

src/main/kotlin/glsl/plugin/editor/GlslStructureView.kt

@@ -0,0 +1,93 @@
+package glsl.plugin.editor
+
+import com.intellij.icons.AllIcons
+import com.intellij.ide.projectView.PresentationData
+import com.intellij.ide.structureView.*
+import com.intellij.ide.util.treeView.smartTree.SortableTreeElement
+import com.intellij.ide.util.treeView.smartTree.Sorter
+import com.intellij.ide.util.treeView.smartTree.TreeElement
+import com.intellij.lang.PsiStructureViewFactory
+import com.intellij.navigation.ItemPresentation
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.editor.HighlighterColors
+import com.intellij.psi.NavigatablePsiElement
+import com.intellij.psi.PsiFile
+import com.intellij.psi.util.PsiTreeUtil
+import glsl.plugin.language.GlslFile
+import glsl.psi.impl.GlslFunctionDefinitionImpl
+import glsl.psi.interfaces.GlslExternalDeclaration
+import glsl.psi.interfaces.GlslFunctionDefinition
+
+
+class GlslStructureViewFactory : PsiStructureViewFactory {
+    override fun getStructureViewBuilder(psiFile: PsiFile): StructureViewBuilder {
+        return object : TreeBasedStructureViewBuilder() {
+            override fun createStructureViewModel(editor: Editor?): StructureViewModel {
+                return GlslStructureViewModel(editor, psiFile)
+            }
+        }
+    }
+}
+
+class GlslStructureViewModel(editor: Editor?, psiFile: PsiFile) :
+    StructureViewModelBase(psiFile, editor, GlslStructureViewElement(psiFile)), StructureViewModel.ElementInfoProvider {
+
+    override fun getSorters(): Array<Sorter> {
+        return arrayOf(Sorter.ALPHA_SORTER)
+    }
+
+    override fun getSuitableClasses(): Array<Class<GlslExternalDeclaration>> {
+        return arrayOf(GlslExternalDeclaration::class.java)
+    }
+
+    override fun isAlwaysShowsPlus(element: StructureViewTreeElement?): Boolean {
+        return false
+    }
+
+    override fun isAlwaysLeaf(element: StructureViewTreeElement?): Boolean {
+        return element?.value is GlslExternalDeclaration
+    }
+}
+
+
+class GlslStructureViewElement(private val element: NavigatablePsiElement) : StructureViewTreeElement, SortableTreeElement {
+
+    override fun getValue(): Any {
+        return element
+    }
+
+    override fun getPresentation(): ItemPresentation {
+        if (element is GlslFunctionDefinition) {
+            return PresentationData(element.functionDeclarator.text + ")", "", AllIcons.Nodes.Function, HighlighterColors.NO_HIGHLIGHTING)
+        } else if (element is GlslFile) {
+            return element.presentation ?: PresentationData()
+        }
+        return PresentationData()
+    }
+
+    override fun getChildren(): Array<TreeElement> {
+        if (element !is GlslFile) return emptyArray()
+        val externalDeclarations = PsiTreeUtil.getChildrenOfType(element, GlslExternalDeclaration::class.java) ?: return emptyArray()
+        val funcs = mutableListOf<TreeElement>()
+        for (externalDeclaration in externalDeclarations) {
+            if (externalDeclaration.functionDefinition == null) continue
+            funcs.add(GlslStructureViewElement(externalDeclaration.functionDefinition!! as GlslFunctionDefinitionImpl))
+        }
+        return funcs.toTypedArray()
+    }
+
+    override fun getAlphaSortKey(): String {
+        return element.name ?: ""
+    }
+
+    override fun navigate(requestFocus: Boolean) {
+        element.navigate(requestFocus)
+    }
+
+    override fun canNavigate(): Boolean {
+        return element.canNavigate()
+    }
+    override fun canNavigateToSource(): Boolean {
+        return element.canNavigateToSource()
+    }
+}