Use path.combine

Author: jcs090218

Server/Handlers/SignatureHelpHandler.cs

@@ -1,14 +1,11 @@
-using System.Linq;
-using System.Security.Cryptography.Xml;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Document;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 using ShaderlabVS.Data;
 using ShaderLS.Management;
-using static System.Net.Mime.MediaTypeNames;
 
 namespace ShaderLS.Handlers
 {

Server/ShaderlabVS.Data/Attributes.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace ShaderlabVS.Data
+namespace ShaderlabVS.Data
 {
     [AttributeUsage(AttributeTargets.Property, Inherited = false, AllowMultiple = false)]
     sealed class DefinationKeyAttribute : Attribute

Server/ShaderlabVS.Data/DefinationDataProvider.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
+using System.Reflection;
 
 namespace ShaderlabVS.Data
 {

Server/ShaderlabVS.Data/DefinationReader.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
+using System.Text;
 using System.Text.RegularExpressions;
 
 namespace ShaderlabVS.Data

Server/ShaderlabVS.Data/Models.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ShaderlabVS.Data
+namespace ShaderlabVS.Data
 {
     #region Common
     public class ModelBase

Server/ShaderlabVS.Data/ShaderlabDataManager.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Eventing.Reader;
-using System.IO;
-using System.Linq;
-using System.Reflection;
+using System.Reflection;
 
 namespace ShaderlabVS.Data
 {
@@ -13,15 +8,15 @@ namespace ShaderlabVS.Data
     public class ShaderlabDataManager
     {
         #region Constants
-        public static string HLSL_CG_DATATYPE_DEFINATIONFILE = "Data" + Path.DirectorySeparatorChar.ToString() + "HLSL_CG_datatype.def";
-        public static string HLSL_CG_FUNCTION_DEFINATIONFILE = "Data" + Path.DirectorySeparatorChar.ToString() + "HLSL_CG_functions.def";
-        public static string HLSL_CG_KEYWORD_DEFINATIONFILE = "Data" + Path.DirectorySeparatorChar.ToString() + "HLSL_CG_Keywords.def";
-
-        public static string UNITY3D_DATATYPE_DEFINATIONFILE = "Data" + Path.DirectorySeparatorChar.ToString() + "Unity3D_datatype.def";
-        public static string UNITY3D_FUNCTION_DEFINATIONFILE = "Data" + Path.DirectorySeparatorChar.ToString() + "Unity3D_functions.def";
-        public static string UNITY3D_KEYWORD_DEFINATIONFILE =  "Data" + Path.DirectorySeparatorChar.ToString() + "Unity3D_keywords.def";
-        public static string UNITY3D_MACROS_DEFINATIONFILE =   "Data" + Path.DirectorySeparatorChar.ToString() + "Unity3D_macros.def";
-        public static string UNITY3D_VALUES_DEFINATIONFILE =   "Data" + Path.DirectorySeparatorChar.ToString() + "Unity3D_values.def";
+        public static string HLSL_CG_DATATYPE_DEFINATIONFILE = Path.Combine("Data", "HLSL_CG_datatype.def");
+        public static string HLSL_CG_FUNCTION_DEFINATIONFILE = Path.Combine("Data", "HLSL_CG_functions.def");
+        public static string HLSL_CG_KEYWORD_DEFINATIONFILE = Path.Combine("Data", "HLSL_CG_Keywords.def");
+
+        public static string UNITY3D_DATATYPE_DEFINATIONFILE = Path.Combine("Data", "Unity3D_datatype.def");
+        public static string UNITY3D_FUNCTION_DEFINATIONFILE = Path.Combine("Data", "Unity3D_functions.def");
+        public static string UNITY3D_KEYWORD_DEFINATIONFILE = Path.Combine("Data", "Unity3D_keywords.def");
+        public static string UNITY3D_MACROS_DEFINATIONFILE = Path.Combine("Data", "Unity3D_macros.def");
+        public static string UNITY3D_VALUES_DEFINATIONFILE = Path.Combine("Data", "Unity3D_values.def");
         #endregion
 
         #region Properties

Server/ShaderlabVS/Utilities.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace ShaderlabVS
+namespace ShaderlabVS
 {
     internal class Utilities
     {