Merge pull request #4 from luxuia/deepsource-fix-fdc67365

Use pattern matching to check and perform type conversion
luxuia · Feb 20, 2023 · ed9b40f · ed9b40f
2 parents 650602d + ba2fb3b
commit ed9b40f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/ExcelMerge/CellTemplateSelector.cs b/ExcelMerge/CellTemplateSelector.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -25,8 +25,7 @@ public CellTemplateSelector(string binder, int columnID, string tag) {
         public string tag;
 
         public override System.Windows.DataTemplate SelectTemplate(object item, System.Windows.DependencyObject container) {
-            ExcelData rowdata = item as ExcelData;
-            if (rowdata != null) {
+            if (item is ExcelData rowdata) {
 
                 Brush bg = Brushes.White;
                     var rowdiff = rowdata.diffstatus;

diff --git a/ExcelMerge/DirectoryGridControl.xaml.cs b/ExcelMerge/DirectoryGridControl.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -79,9 +79,7 @@ private void FileGrid_ScrollChanged(object sender, ScrollChangedEventArgs e) {
 
         private void FileGrid_SelectionChanged(object sender, SelectionChangedEventArgs e) {
             if (e.AddedItems.Count > 0) {
-                // chang selected row
-                var row = e.AddedItems[0] as ExcelData;
-                if (row != null) {
+                if (e.AddedItems[0] is ExcelData row) {
                     // 新行 NewRowItem 类
                     DirectoryDifferWindow.instance.OnSelectGridRow(Tag as string, row.rowId);
                 }

diff --git a/ExcelMerge/ExcelGridControl.xaml.cs b/ExcelMerge/ExcelGridControl.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -352,9 +352,8 @@ private void ExcelGrid_Drop(object sender, DragEventArgs e) {
         private void ExcelGrid_LoadingRow(object sender, DataGridRowEventArgs e) {
             var row = e.Row;
             var index = row.GetIndex();
-            var item = row.Item as ExcelData;
 
-            if (item != null) { 
+            if (row.Item is ExcelData item) { 
                 row.Header = (item.rowId+1).ToString();
                 row.Height = item.maxLineCount * 15+5;
             }
@@ -370,9 +369,7 @@ private void ExcelGrid_ScrollChanged(object sender, ScrollChangedEventArgs e) {
 
         private void ExcelGrid_SelectionChanged(object sender, SelectionChangedEventArgs e) {
             if (e.AddedItems.Count > 0) {
-                // chang selected row
-                var row = e.AddedItems[0] as ExcelData;
-                if (row != null) {
+                if (e.AddedItems[0] is ExcelData row) {
                     // 新行 NewRowItem 类
                     //MainWindow.instance.OnSelectGridRow(Tag as string, row.rowId);
                 }

diff --git a/ExcelMerge/MainWindow.xaml.cs b/ExcelMerge/MainWindow.xaml.cs
@@ -946,8 +946,7 @@ private void SortKeyCombo_SelectionChanged(object sender, SelectionChangedEventA
             var sheetdata = sheetsDiff[src_sheet];
 
             if (e.AddedItems.Count > 0) {
-                var sortkey = e.AddedItems[0] as SheetSortKeyCombo;
-                if (sortkey != null && sheetdata.sortKey != sortkey.ID) {
+                if (e.AddedItems[0] is SheetSortKeyCombo sortkey && sheetdata.sortKey != sortkey.ID) {
                     sheetdata.sortKey = sortkey.ID;
 
                     ReDiffCurSheet();