fix #861

CodeCompletion/DomSyntaxTreeVisitor.cs

@@ -38,6 +38,7 @@ namespace CodeCompletion
 		private bool search_all = false;//flag, iskat vse peregruzki ili tolko odnu. sdelal dlja effektivnosti. true zadaetsja tolko v visit(method_call)
         internal bool parse_only_interface = false;
         private template_type_reference converted_template_type = null;
+        private List<var_def_statement> pending_is_pattern_vars = new List<var_def_statement>();
 
         public SemanticOptions semantic_options = new SemanticOptions();
 		
@@ -735,10 +736,82 @@ namespace CodeCompletion
                 _while_node.statements.visit(this);
         }
 
+        public override void visit(is_pattern_expr _is_pattern_expr)
+        {
+            _is_pattern_expr.right.visit(this);
+        }
+
+        public override void visit(deconstructor_pattern _deconstructor_pattern)
+        {
+            _deconstructor_pattern.type.visit(this);
+            foreach (pattern_deconstructor_parameter pdp in _deconstructor_pattern.parameters)
+            {
+                if (pdp is var_deconstructor_parameter)
+                {
+                    var_deconstructor_parameter vdp = pdp as var_deconstructor_parameter;
+                    pending_is_pattern_vars.Add(new var_def_statement(vdp.identifier, _deconstructor_pattern.type, _deconstructor_pattern.source_context));
+                }
+            }
+        }
+
+        public override void visit(match_with _match_with)
+        {
+            if (_match_with.case_list != null)
+            {
+                foreach (pattern_case pc in _match_with.case_list.elements)
+                    pc.visit(this);
+            }
+           
+        }
+
+        public override void visit(pattern_case _pattern_case)
+        {
+            _pattern_case.pattern.visit(this);
+            statement stmt = merge_with_is_variables(_pattern_case.case_action);
+            stmt.visit(this);
+        }
+
+        public void visit_is_patterns(expression expr)
+        {
+            if (expr is bin_expr)
+            {
+                bin_expr bexpr = expr as bin_expr;
+                visit_is_patterns(bexpr.left);
+                visit_is_patterns(bexpr.right);
+            }
+            else if (expr is is_pattern_expr)
+                expr.visit(this);
+        }
+
+        public statement merge_with_is_variables(statement stmt)
+        {
+            if (pending_is_pattern_vars.Count > 0)
+            {
+                if (stmt is statement_list)
+                {
+                    foreach (var_def_statement vds in pending_is_pattern_vars)
+                        (stmt as statement_list).Insert(0, new var_statement(vds, vds.source_context));
+                }
+                else
+                {
+                    statement_list slist = new statement_list();
+                    slist.source_context = stmt.source_context;
+                    foreach (var_def_statement vds in pending_is_pattern_vars)
+                        slist.Insert(0, new var_statement(vds, vds.source_context));
+                    slist.Add(stmt);
+                    stmt = slist;
+                }
+                pending_is_pattern_vars.Clear();
+            }
+            return stmt;
+        }
+
         public override void visit(PascalABCCompiler.SyntaxTree.if_node _if_node)
         {
-            if (_if_node.then_body != null)
-        	_if_node.then_body.visit(this);
+            visit_is_patterns(_if_node.condition);
+            statement then_stmt = merge_with_is_variables(_if_node.then_body);
+            if (then_stmt != null)
+                then_stmt.visit(this);
             if (_if_node.else_body != null)
                 _if_node.else_body.visit(this);
         }

TestSuite/intellisense_tests/ispattern1.pas

@@ -0,0 +1,14 @@
+type
+  t1=class end;
+
+begin
+  var o:object;
+  
+  if o is t1(var o_t1) then
+    writeln(o_t1{@var o_t1: t1;@});
+  if o is t1(var o_t1) then
+  begin
+    writeln(o_t1{@var o_t1: t1;@});
+  end;
+  writeln(o_t1{@@});
+end.

TestSuite/intellisense_tests/match1.pas

@@ -0,0 +1,22 @@
+type
+  Line = class
+  end;
+  Rectangle = auto class
+    X,Y,Width,Height: real;
+  end;
+  Circle = auto class
+    X,Y,Radius: real;
+  end;
+  
+begin
+  var l := new List<Object>;
+  l.Add(new Line);
+  l.Add(new Circle(10,10,5));
+  l.Add(new Rectangle(10,10,20,10));
+  foreach var x in l do
+    match x with
+  Line(var ll): Println('Line S =',0);
+  Circle(var c): Println('Circle S =',c{@var c: Circle;@}.Radius*c.Radius*Pi);
+  Rectangle(var r{@var r: Rectangle;@}): Println('Rectangle S =',r.Width*r.Height);
+    end;
+end.