chore(release): bump version to 0.0.5

Reviewed-on: #2

editors/datagrip/src/main/kotlin/com/pgtidy/datagrip/PgTidyShowVersionAction.kt

@@ -0,0 +1,42 @@
+package com.pgtidy.datagrip
+
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.progress.ProgressIndicator
+import com.intellij.openapi.progress.Task
+import com.intellij.openapi.ui.Messages
+
+class PgTidyShowVersionAction : AnAction() {
+
+    override fun actionPerformed(e: AnActionEvent) {
+        val project = e.project
+
+        object : Task.Backgroundable(project, "PgTidy: checking version…", false) {
+            override fun run(indicator: ProgressIndicator) {
+                val proc = try {
+                    ProcessBuilder("pgtidy", "version")
+                        .redirectErrorStream(false)
+                        .start()
+                } catch (ex: Exception) {
+                    ApplicationManager.getApplication().invokeLater {
+                        Messages.showErrorDialog(project, "Cannot start pgtidy: ${ex.message}", "PgTidy")
+                    }
+                    return
+                }
+
+                val output = proc.inputStream.bufferedReader().readText()
+                val stderr = proc.errorStream.bufferedReader().readText()
+                val exit = proc.waitFor()
+
+                ApplicationManager.getApplication().invokeLater {
+                    if (exit != 0) {
+                        Messages.showErrorDialog(project, stderr.ifBlank { "pgtidy exited with code $exit" }, "PgTidy")
+                        return@invokeLater
+                    }
+                    Messages.showInfoMessage(project, output.trim(), "PgTidy Version")
+                }
+            }
+        }.queue()
+    }
+}

editors/datagrip/src/main/kotlin/com/pgtidy/datagrip/PgTidyStatusBarWidget.kt

@@ -0,0 +1,72 @@
+package com.pgtidy.datagrip
+
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.wm.StatusBar
+import com.intellij.openapi.wm.StatusBarWidget
+import com.intellij.openapi.wm.StatusBarWidgetFactory
+import com.intellij.util.Consumer
+import java.awt.event.MouseEvent
+
+private const val WIDGET_ID = "com.pgtidy.StatusBarWidget"
+
+class PgTidyStatusBarWidget(private val project: Project) : StatusBarWidget, StatusBarWidget.TextPresentation {
+
+    private var statusBar: StatusBar? = null
+    private var text: String = "pgtidy: …"
+
+    override fun ID(): String = WIDGET_ID
+
+    override fun install(statusBar: StatusBar) {
+        this.statusBar = statusBar
+        refresh()
+    }
+
+    override fun dispose() {
+        statusBar = null
+    }
+
+    override fun getPresentation(): StatusBarWidget.WidgetPresentation = this
+
+    override fun getText(): String = text
+
+    override fun getAlignment(): Float = java.awt.Component.CENTER_ALIGNMENT
+
+    override fun getTooltipText(): String = "PgTidy version — click to refresh"
+
+    override fun getClickConsumer(): Consumer<MouseEvent> = Consumer { refresh() }
+
+    fun refresh() {
+        ApplicationManager.getApplication().executeOnPooledThread {
+            text = try {
+                val proc = ProcessBuilder("pgtidy", "version")
+                    .redirectErrorStream(true)
+                    .start()
+                val output = proc.inputStream.bufferedReader().readText().trim()
+                val exit = proc.waitFor()
+                if (exit == 0 && output.isNotBlank()) output else "pgtidy: not found"
+            } catch (ex: Exception) {
+                "pgtidy: not found"
+            }
+            ApplicationManager.getApplication().invokeLater {
+                statusBar?.updateWidget(WIDGET_ID)
+            }
+        }
+    }
+}
+
+class PgTidyStatusBarWidgetFactory : StatusBarWidgetFactory {
+    override fun getId(): String = WIDGET_ID
+
+    override fun getDisplayName(): String = "PgTidy Version"
+
+    override fun isAvailable(project: Project): Boolean = true
+
+    override fun createWidget(project: Project): StatusBarWidget = PgTidyStatusBarWidget(project)
+
+    override fun disposeWidget(widget: StatusBarWidget) {
+        widget.dispose()
+    }
+
+    override fun canBeEnabledOn(statusBar: StatusBar): Boolean = true
+}

editors/datagrip/src/main/resources/META-INF/plugin.xml

@@ -21,8 +21,20 @@
             <add-to-group group-id="EditorPopupMenu" anchor="first"/>
             <keyboard-shortcut keymap="$default" first-keystroke="ctrl alt shift P"/>
         </action>
+        <action id="com.pgtidy.ShowVersion"
+                class="com.pgtidy.datagrip.PgTidyShowVersionAction"
+                text="Show PgTidy Version"
+                description="Show the installed pgtidy binary version">
+            <add-to-group group-id="ToolsMenu" anchor="last"/>
+        </action>
     </actions>
 
+    <extensions defaultExtensionNs="com.intellij">
+        <statusBarWidgetFactory id="com.pgtidy.StatusBarWidget"
+                                 implementation="com.pgtidy.datagrip.PgTidyStatusBarWidgetFactory"
+                                 order="last"/>
+    </extensions>
+
     <extensions defaultExtensionNs="com.redhat.devtools.lsp4ij">
         <server id="com.pgtidy.lsp"
                 name="PgTidy"

linux/arch/PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Hein (Warky Devs) <hein@warky.dev>
 pkgname=pgtidy-bin
-pkgver=0.0.3
+pkgver=0.0.5
 pkgrel=1
 pkgdesc="PostgreSQL SQL formatter and linter"
 arch=('x86_64' 'aarch64')

linux/centos/pgtidy.spec

@@ -1,5 +1,5 @@
 Name:           pgtidy
-Version:        0.0.3
+Version:        0.0.5
 Release:        1%{?dist}
 Summary:        PostgreSQL SQL formatter and linter
 

pkg/format/body.go

@@ -379,6 +379,7 @@ func formatBodyStatements(text string, st config.Style) string {
 		stmt          []bline
 		parenDepth    int
 		blockDepth    int // 0=col-0 (BEGIN/END/EXCEPTION), 1=body, 2=nested…
+		caseDepth     int // depth of open CASE…END expressions (WHEN…THEN is not a block opener)
 		inException   bool
 		pendingBlanks int
 		depthInc      bool // increment blockDepth after next flush
@@ -440,13 +441,9 @@ func formatBodyStatements(text string, st config.Style) string {
 			stmtLines = joinThenToCondition(stmt)
 		}
 
-		for i, ll := range stmtLines {
+		formattedLines := formatBodyStmtLines(stmtLines, baseIndent, st)
-			if i == 0 || ll.indent == "" {
+		for _, line := range formattedLines {
-				result.WriteString(baseIndent)
+			result.WriteString(line)
-			} else {
-				result.WriteString(ll.indent)
-			}
-			result.WriteString(ll.text)
 			result.WriteString(nl)
 		}
 
@@ -529,18 +526,41 @@ func formatBodyStatements(text string, st config.Style) string {
 			}
 			if parenDepth == 0 && tok.Kind == lexer.Ident {
 				lastD0Kw = lowerASCII(tok.Text)
+				switch lastD0Kw {
+				case "case":
+					caseDepth++
+				case "end":
+					if caseDepth > 0 {
+						caseDepth--
+					}
+				}
 			}
 		}
 
 		if parenDepth == 0 && len(stmt) > 0 {
 			switch lastD0Kw {
-			case "then", "loop", "begin":
+			case "then":
+				// A THEN ending a CASE…WHEN branch is not a PL/pgSQL block
+				// opener; only one matching END closes the whole CASE, so
+				// treating each WHEN…THEN as a block open would permanently
+				// inflate blockDepth.
+				if caseDepth == 0 {
+					fw0 := lowerASCII(firstBodyKeyword(stmt[0].text))
+					if fw0 != "elsif" && fw0 != "elseif" {
+						depthInc = true
+					}
+					flush()
+				}
+			case "loop", "begin":
 				fw0 := lowerASCII(firstBodyKeyword(stmt[0].text))
 				if fw0 != "elsif" && fw0 != "elseif" {
 					depthInc = true
 				}
 				flush()
 			case "else", "exception":
+				if caseDepth > 0 {
+					break
+				}
 				flush()
 			}
 		}
@@ -550,6 +570,131 @@ func formatBodyStatements(text string, st config.Style) string {
 	return result.String()
 }
 
+// formatBodyStmtLines formats one flushed PL/pgSQL statement at its contextual
+// base indent. Multi-line UPDATE/DELETE statements inside PL/pgSQL get their
+// top-level SET/WHERE/AND/OR clauses realigned under the statement while nested
+// subqueries keep their original indentation. Non-DML statements keep
+// continuation indentation, except that standalone structural keywords such as
+// THEN are aligned with the block opener.
+func formatBodyStmtLines(lines []bline, baseIndent string, st config.Style) []string {
+	if len(lines) == 0 {
+		return nil
+	}
+
+	if looksLikeMultiLineBodyDML(lines) {
+		return reindentBodyDML(lines, baseIndent, st)
+	}
+
+	out := make([]string, 0, len(lines))
+	for i, ll := range lines {
+		text := ll.text
+		indent := baseIndent
+		if i > 0 && ll.indent != "" && !isStandaloneBodyKeyword(ll.text, "then", "else", "elsif", "elseif") {
+			indent = ll.indent
+		}
+		out = append(out, indent+text)
+	}
+	return out
+}
+
+func looksLikeMultiLineBodyDML(lines []bline) bool {
+	if len(lines) < 2 {
+		return false
+	}
+	kw := lowerASCII(firstBodyKeyword(lines[0].text))
+	return kw == "update" || kw == "delete"
+}
+
+func reindentBodyDML(lines []bline, baseIndent string, st config.Style) []string {
+	out := make([]string, 0, len(lines)+1)
+	afterWhere := false
+	parenDepth := 0
+	for i, ll := range lines {
+		text := strings.TrimRight(ll.text, " 	")
+		lineDepth := parenDepth
+		kw := lowerASCII(firstBodyKeyword(text))
+		if afterWhere && lineDepth == 0 && kw != "and" && kw != "or" {
+			out = append(out, baseIndent+st.Indent+st.Indent+strings.TrimSpace(text))
+			afterWhere = false
+			updateBodyParenDepth(text, &parenDepth)
+			continue
+		}
+		if lineDepth == 0 && (kw == "set" || kw == "where" || kw == "values" || kw == "returning") {
+			if kw == "where" {
+				whereText := strings.TrimSpace(text)
+				fields := strings.Fields(whereText)
+				nextKw := ""
+				if i+1 < len(lines) {
+					nextKw = lowerASCII(firstBodyKeyword(lines[i+1].text))
+				}
+				if len(fields) > 1 && (nextKw == "and" || nextKw == "or") {
+					out = append(out, baseIndent+fields[0])
+					out = append(out, baseIndent+st.Indent+st.Indent+strings.TrimSpace(whereText[len(fields[0]):]))
+					afterWhere = false
+					continue
+				}
+				afterWhere = len(fields) == 1
+			}
+			out = append(out, baseIndent+strings.TrimSpace(text))
+			continue
+		}
+		if lineDepth == 0 && (kw == "and" || kw == "or") {
+			out = append(out, baseIndent+st.Indent+strings.TrimSpace(text))
+			afterWhere = false
+			updateBodyParenDepth(text, &parenDepth)
+			continue
+		}
+		if i == 0 {
+			out = append(out, baseIndent+strings.TrimSpace(text))
+		} else if ll.indent != "" {
+			out = append(out, ll.indent+strings.TrimSpace(text))
+		} else {
+			out = append(out, baseIndent+strings.TrimSpace(text))
+		}
+		afterWhere = false
+		updateBodyParenDepth(text, &parenDepth)
+	}
+	return out
+}
+
+func updateBodyParenDepth(s string, depth *int) {
+	for _, tok := range lexer.Lex(s) {
+		switch tok.Kind {
+		case lexer.LParen, lexer.LBracket:
+			(*depth)++
+		case lexer.RParen, lexer.RBracket:
+			if *depth > 0 {
+				(*depth)--
+			}
+		}
+	}
+}
+
+func significantBodyTokens(s string) []cst.Tok {
+	var toks []cst.Tok
+	for _, tok := range lexer.Lex(s) {
+		if tok.IsTrivia() || tok.Kind == lexer.EOF {
+			continue
+		}
+		toks = append(toks, cst.Tok{Tok: tok})
+	}
+	return toks
+}
+
+func isStandaloneBodyKeyword(s string, kws ...string) bool {
+	toks := significantBodyTokens(s)
+	if len(toks) != 1 || toks[0].Tok.Kind != lexer.Ident {
+		return false
+	}
+	low := lowerASCII(toks[0].Tok.Text)
+	for _, kw := range kws {
+		if low == kw {
+			return true
+		}
+	}
+	return false
+}
+
 // joinThenToCondition merges a THEN line (on its own bline) into the preceding
 // condition line when plpgsql_if_then_newline is false.
 func joinThenToCondition(lines []bline) []bline {

pkg/format/format_test.go

@@ -107,6 +107,66 @@ func TestFormatMmProcBroken(t *testing.T) {
 	}
 }
 
+func TestFormatIssue1PLpgSQLIndenting(t *testing.T) {
+	src := "CREATE FUNCTION f() RETURNS void LANGUAGE plpgsql AS $$\n" +
+		"DECLARE\n" +
+		"  r_lp record;\n" +
+		"BEGIN\n" +
+		"   if r_lp.total > 0\n" +
+		"      and r_lp.totaldone >= r_lp.total\n" +
+		"    then\n" +
+		"    update core.process u\n" +
+		"      set status = 'done'\n" +
+		"      where u.rid_process = r_lp.rid_process\n" +
+		"        and nv(u.status) <> 'done';\n" +
+		"  elsif r_lp.total > 0\n" +
+		"    then\n" +
+		"    update core.process u\n" +
+		"      set status = 'open'\n" +
+		"      where u.rid_process = r_lp.rid_process\n" +
+		"        and nv(u.status) <> 'open';\n" +
+		"\n" +
+		"  end if;\n" +
+		"$$;\n"
+
+	want := "CREATE FUNCTION f(\n" +
+		")\n" +
+		"RETURNS void\n" +
+		"LANGUAGE plpgsql\n" +
+		"AS\n" +
+		"$$\n" +
+		"DECLARE\n" +
+		"  r_lp record;\n" +
+		"BEGIN\n" +
+		"  if r_lp.total > 0\n" +
+		"      and r_lp.totaldone >= r_lp.total\n" +
+		"  then\n" +
+		"    update core.process u\n" +
+		"    set status = 'done'\n" +
+		"    where\n" +
+		"        u.rid_process = r_lp.rid_process\n" +
+		"      and nv(u.status) <> 'done';\n" +
+		"  elsif r_lp.total > 0\n" +
+		"  then\n" +
+		"    update core.process u\n" +
+		"    set status = 'open'\n" +
+		"    where\n" +
+		"        u.rid_process = r_lp.rid_process\n" +
+		"      and nv(u.status) <> 'open';\n" +
+		"\n" +
+		"  end if;\n" +
+		"$$;\n"
+
+	got := format(src)
+	if got != want {
+		t.Errorf("issue #1 PL/pgSQL indenting\n--- got ---\n%s\n--- want ---\n%s", got, want)
+	}
+	checkDML(t, "issue #1 PL/pgSQL indenting", got)
+	if !semanticallyEqual(src, got) {
+		t.Errorf("issue #1 PL/pgSQL indenting changed semantics")
+	}
+}
+
 func TestCorpusIdempotentAndSafe(t *testing.T) {
 	dir := filepath.Join("..", "..", "testdata", "corpus")
 	entries, err := os.ReadDir(dir)