From ac1b4a03a403a6defa830aa4b62373c10d966535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B5=D0=BC=D0=BB=D1=8F=D0=BA?=
 <92867056+AlexanderZemlyak@users.noreply.github.com>
Date: Mon, 16 Feb 2026 14:05:42 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=B0?=
 =?UTF-8?q?=20length=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B0=20Substring=20?=
 =?UTF-8?q?=D0=B2=20TipPainterTools=20(#3388)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add substring length check in TipPainterTools

* Add count check in FindClosingParenthesis method
---
 ParserTools/ParserTools/BaseLanguageIntellisenseSupport.cs    | 3 +++
 VisualPascalABCNET/DS/CodeCompletionVisual/TipPainterTools.cs | 4 ++++
 .../DS/CodeCompletionVisual/TipPainterTools.cs                | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/ParserTools/ParserTools/BaseLanguageIntellisenseSupport.cs b/ParserTools/ParserTools/BaseLanguageIntellisenseSupport.cs
index 3b017c7cf..5e4b85145 100644
--- a/ParserTools/ParserTools/BaseLanguageIntellisenseSupport.cs
+++ b/ParserTools/ParserTools/BaseLanguageIntellisenseSupport.cs
@@ -1980,6 +1980,9 @@ namespace PascalABCCompiler.Parsers
                 i++;
             }
 
+            if (count > 0)
+                return -1;
+
             return i;
         }
 
diff --git a/VisualPascalABCNET/DS/CodeCompletionVisual/TipPainterTools.cs b/VisualPascalABCNET/DS/CodeCompletionVisual/TipPainterTools.cs
index 3115a640e..7eea30340 100644
--- a/VisualPascalABCNET/DS/CodeCompletionVisual/TipPainterTools.cs
+++ b/VisualPascalABCNET/DS/CodeCompletionVisual/TipPainterTools.cs
@@ -121,6 +121,10 @@ namespace ICSharpCode.TextEditor.Util
                                 {
                                     int paramDelimLength = languageIntellisenseSupport.ParameterDelimiter.Length;
 
+                                    // Проверка на всякий случай, чтобы не возникало ошибки с отрицательным length в Substring  EVA
+                                    if (paranthesisIndex - paramDelimLength < paramDelimLength)
+                                        return;
+
                                     string paramDescription = descriptionAfterBracket.Substring(paramDelimIndex + paramDelimLength, paranthesisIndex - paramDelimIndex - paramDelimLength);
 
                                     if (languageIntellisenseSupport.IsParams(paramDescription))
diff --git a/VisualPascalABCNETLinux/DS/CodeCompletionVisual/TipPainterTools.cs b/VisualPascalABCNETLinux/DS/CodeCompletionVisual/TipPainterTools.cs
index bbf7e3794..377e916be 100644
--- a/VisualPascalABCNETLinux/DS/CodeCompletionVisual/TipPainterTools.cs
+++ b/VisualPascalABCNETLinux/DS/CodeCompletionVisual/TipPainterTools.cs
@@ -120,6 +120,10 @@ namespace ICSharpCode.TextEditor.Util
                                 {
                                     int paramDelimLength = languageIntellisenseSupport.ParameterDelimiter.Length;
 
+                                    // Проверка на всякий случай, чтобы не возникало ошибки с отрицательным length в Substring  EVA
+                                    if (paranthesisIndex - paramDelimLength < paramDelimLength)
+                                        return;
+
                                     string paramDescription = descriptionAfterBracket.Substring(paramDelimIndex + paramDelimLength, paranthesisIndex - paramDelimIndex - paramDelimLength);
 
                                     if (languageIntellisenseSupport.IsParams(paramDescription))