From 61cda2331129ca81164e9c877a3f39b1e1e69b84 Mon Sep 17 00:00:00 2001
From: Grim Maple <grimmaple95@gmail.com>
Date: Thu, 14 Apr 2022 23:57:20 +0300
Subject: [PATCH] Fix deprecations

---
 src/ddc/lexer/Lexer.d         | 26 +++++++++++++-------------
 src/dlangide/ui/dsourceedit.d |  2 +-
 src/dlangide/ui/searchPanel.d |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/ddc/lexer/Lexer.d b/src/ddc/lexer/Lexer.d
index 72465bd..f1abaec 100644
--- a/src/ddc/lexer/Lexer.d
+++ b/src/ddc/lexer/Lexer.d
@@ -69,7 +69,7 @@ class BasicTypeX : Lexem {
     in {
         assert(isBasicTypeXToken(token));
     }
-    body {
+    do {
         _token = token;
     }
 }
@@ -97,7 +97,7 @@ class TypeCtor : Lexem {
     in {
         assert(isTypeCtorToken(token));
     }
-    body {
+    do {
         _token = token;
     }
 }
@@ -112,14 +112,14 @@ class TypeCtors : Lexem {
     in {
         assert(isTypeCtorToken(token));
     }
-    body {
+    do {
         _list ~= new TypeCtor(token);
     }
     public void append(Token token)
     in {
         assert(isTypeCtorToken(token));
     }
-    body {
+    do {
         _list ~= new TypeCtor(token);
     }
 }
@@ -134,7 +134,7 @@ class Identifier : Lexem {
     in {
         assert(identifier.type == TokenType.IDENTIFIER);
     }
-    body {
+    do {
         _token = cast(IdentToken)identifier;
     }
 }
@@ -157,14 +157,14 @@ class IdentifierList : Lexem {
     in {
         assert(ident.type == TokenType.IDENTIFIER);
     }
-    body {
+    do {
         _identifier = new Identifier(ident);
         _identifierList = identifierList;
     }
     public this(TemplateInstance templateInstance, IdentifierList identifierList = null)
     in {
     }
-    body {
+    do {
         _templateInstance = templateInstance;
         _identifierList = identifierList;
     }
@@ -181,7 +181,7 @@ class TemplateInstance : Lexem {
     public this()
     in {
     }
-    body {
+    do {
     }
 }
 
@@ -207,7 +207,7 @@ class BasicType : Lexem {
     public this()
     in {
     }
-    body {
+    do {
     }
 }
 
@@ -228,7 +228,7 @@ class Typeof : Lexem {
     public this(Expression expression)
     in {
     }
-    body {
+    do {
         _expression = expression;
     }
 }
@@ -245,7 +245,7 @@ class Type : Lexem {
     public this()
     in {
     }
-    body {
+    do {
     }
 }
 
@@ -259,7 +259,7 @@ class Expression : Lexem {
     public this()
     in {
     }
-    body {
+    do {
     }
 }
 
@@ -273,7 +273,7 @@ class AltDeclarator : Lexem {
     public this()
     in {
     }
-    body {
+    do {
     }
 }
 
diff --git a/src/dlangide/ui/dsourceedit.d b/src/dlangide/ui/dsourceedit.d
index 73c081a..4269dd6 100644
--- a/src/dlangide/ui/dsourceedit.d
+++ b/src/dlangide/ui/dsourceedit.d
@@ -790,7 +790,7 @@ class CompletionPopupMenu : PopupMenu {
 
     MenuItem updateItems() {
         MenuItem res = new MenuItem();
-        foreach(int i, dstring suggestion ; _suggestions) {
+        foreach(i, dstring suggestion ; _suggestions) {
             if (_prefix.length && !suggestion.startsWith(_prefix))
                 continue;
             string iconId;
diff --git a/src/dlangide/ui/searchPanel.d b/src/dlangide/ui/searchPanel.d
index 5007d8d..bc3bbde 100644
--- a/src/dlangide/ui/searchPanel.d
+++ b/src/dlangide/ui/searchPanel.d
@@ -372,11 +372,11 @@ SearchMatchList findMatches(in string filename, in dstring searchString) {
     SearchMatchList match;
     match.filename = filename;
 
-    foreach(int lineIndex, dstring line; content.lines) {
+    foreach(lineIndex, dstring line; content.lines) {
         auto colIndex = line.indexOf(searchString);
         
         if (colIndex != -1) {
-            match.matches ~= SearchMatch(lineIndex, colIndex, line);
+            match.matches ~= SearchMatch(cast(int)lineIndex, colIndex, line);
         }
     }
     return match;