From f058e9e828f494ebf8d60cabff7999f219048623 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Fri, 4 Mar 2022 11:45:41 +0100
Subject: girparser: Don't count instance-parameter when checking for backwards
 closure reference

Fixes https://gitlab.gnome.org/GNOME/vala/issues/721
---
 vala/valagirparser.vala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'vala')

diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index 53d073926..355d0fa74 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -3469,11 +3469,13 @@ public class Vala.GirParser : CodeVisitor {
 
 			var current_parameter_idx = -1;
 			while (current_token == MarkupTokenType.START_ELEMENT) {
-				current_parameter_idx++;
-
 				var is_instance_parameter = (reader.name == "instance-parameter"
 					&& !(symbol_type == "function" || symbol_type == "constructor"));
 
+				if (!is_instance_parameter) {
+					current_parameter_idx++;
+				}
+
 				if (instance_idx > -2 && instance_idx == current_parameter_idx) {
 					skip_element ();
 					continue;
-- 
cgit v1.2.1