Added the ostw.optimizeOutput setting.

Author: ItsDeltin

Deltinteger/Deltinteger/Elements/Condition.cs

@@ -31,9 +31,17 @@ public Condition(Element value1, Elements.Operators compareOperator, Element val
         public Condition(V_Compare condition) : this((Element)condition.ParameterValues[0], (EnumMember)condition.ParameterValues[1], (Element)condition.ParameterValues[2]) {}
         public Condition(Element condition) : this(condition, Operators.Equal, new V_True()) {}
 
-        public string ToWorkshop(OutputLanguage language)
+        public string ToWorkshop(OutputLanguage language, bool optimize)
         {
-            return Value1.Optimize().ToWorkshop(language) + " " + CompareOperator.ToWorkshop(language) + " " + Value2.Optimize().ToWorkshop(language);
+            Element a = Value1;
+            Element b = Value2;
+            if (optimize)
+            {
+                a = a.Optimize();
+                b = b.Optimize();
+            }
+            
+            return a.ToWorkshop(language) + " " + CompareOperator.ToWorkshop(language) + " " + b.ToWorkshop(language);
         }
 
         public static implicit operator Condition(Element element) => new Condition(element);

Deltinteger/Deltinteger/Elements/Rule.cs

@@ -39,7 +39,7 @@ public override string ToString()
             return Name;
         }
 
-        public string ToWorkshop(OutputLanguage language)
+        public string ToWorkshop(OutputLanguage language, bool optimize)
         {            
             var builder = new TabStringBuilder(true);
 
@@ -73,7 +73,7 @@ public string ToWorkshop(OutputLanguage language)
                 builder.AppendLine("{");                                                // |   {
                 builder.Indent = 2;                                                     // |   (indent)
                 foreach (var condition in Conditions)                                   // |       
-                    builder.AppendLine(condition.ToWorkshop(language) + ";");           // |       Number Of Players >= 3;
+                    builder.AppendLine(condition.ToWorkshop(language, optimize) + ";"); // |       Number Of Players >= 3;
                 builder.Indent = 1;                                                     // |   (outdent)
                 builder.AppendLine("}");                                                // |   }
             }                                                                           //
@@ -86,7 +86,10 @@ public string ToWorkshop(OutputLanguage language)
                 builder.AppendLine("{");                                                // |   {
                 builder.Indent = 2;                                                     // |   (indent)
                 foreach (var action in Actions)                                         // |       
-                    builder.AppendLine(action.Optimize().ToWorkshop(language));         // |       Set Global Variable(A, true);
+                    if (optimize)                                                       // |
+                        builder.AppendLine(action.Optimize().ToWorkshop(language));     // |       Set Global Variable(A, true);
+                    else                                                                // |
+                        builder.AppendLine(action.ToWorkshop(language));                // |
                 builder.Indent = 1;                                                     // |   (outdent)
                 builder.AppendLine("}");                                                // |   }
             }                                                                           //

Deltinteger/Deltinteger/Elements/Values.cs

@@ -448,7 +448,7 @@ public override Element Optimize()
                 double y = -Math.Sin(v * (Math.PI / 180));
                 double z = Math.Cos(h * (Math.PI / 180));
 
-                if (y.ToString() == "-0")
+                if (y == -0)
                     y = 0;
 
                 return new V_Vector(x, y, z);
@@ -678,7 +678,7 @@ public override Element Optimize()
                 if (double.IsNaN(gradient))
                     gradient = 0;
                 double result = Math.Atan(gradient) * (180 / Math.PI);
-                if (result.ToString() == "-0") //thank you c# for -0 being a thing
+                if (result == -0) //thank you c# for -0 being a thing
                     result = 180;
                 return result;
             }

Deltinteger/Deltinteger/Language Server/ConfigurationHandler.cs

@@ -16,6 +16,8 @@ namespace Deltin.Deltinteger.LanguageServer
 {
     public class ConfigurationHandler : IDidChangeConfigurationHandler
     {
+        public static bool OptimizeOutput = true;
+
         private DeltintegerLanguageServer _languageServer { get; }
 
         public ConfigurationHandler(DeltintegerLanguageServer languageServer)
@@ -31,6 +33,7 @@ public Task<Unit> Handle(DidChangeConfigurationParams configChangeParams, Cancel
             {
                 var config = json.ToObject<RawConfiguration>();
                 I18n.I18n.LoadLanguage(config.GetOutputLanguage());
+                OptimizeOutput = config.optimizeOutput;
             }
 
             return Unit.Task;
@@ -50,8 +53,11 @@ public void SetCapability(DidChangeConfigurationCapability capability)
 
         class RawConfiguration
         {
+#pragma warning disable CS0649
             public string outputLanguage;
             public string deltintegerPath;
+            public bool optimizeOutput;
+#pragma warning restore CS0649
 
             public OutputLanguage GetOutputLanguage()
             {

Deltinteger/Deltinteger/Parse/Translate.cs

@@ -255,7 +255,7 @@ void ToWorkshop(Func<VarCollection, Rule[]> addRules)
 
             // Get the rules.
             foreach (var rule in WorkshopRules)
-                result.AppendLine(rule.ToWorkshop(I18n.I18n.CurrentLanguage));
+                result.AppendLine(rule.ToWorkshop(I18n.I18n.CurrentLanguage, ConfigurationHandler.OptimizeOutput));
 
             WorkshopCode = result.ToString();
         }

overwatch-script-to-workshop/package.json

@@ -62,6 +62,12 @@
                     "default": "English",
                     "description": "The output language of the OSTW output."
                 },
+                "ostw.optimizeOutput": {
+                    "scope": "window",
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Determines if the workshop output will be optimized."
+                },
                 "ostw.deltintegerPath": {
                     "scope": "machine",
                     "type": "string",
@@ -81,11 +87,6 @@
             }
         },
         "commands": [
-            {
-                "command": "ostw.webviewOutput",
-                "title": "Create webview panel for workshop code output.",
-                "category": "Overwatch Script To Workshop"
-            }
         ]
     },
     "scripts": {