From 692ab8112e06e6ee2ef442371f72028e303de017 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@yahoo.com>
Date: Tue, 7 Nov 2017 15:36:30 -0800
Subject: [PATCH 1/2] make program optional in debug json and reformat

---
 package.json | 99 +++++++++++++++++++++++++---------------------------
 1 file changed, 48 insertions(+), 51 deletions(-)

diff --git a/package.json b/package.json
index da3639c6ce3e..0d1cb713b0a7 100644
--- a/package.json
+++ b/package.json
@@ -553,9 +553,6 @@
         ],
         "configurationAttributes": {
           "launch": {
-            "required": [
-              "program"
-            ],
             "properties": {
               "module": {
                 "type": "string",
@@ -720,44 +717,14 @@
             ]
           },
           {
-            "name": "Python: PySpark",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": true,
-            "osx": {
-              "pythonPath": "${env:SPARK_HOME}/bin/spark-submit"
-            },
-            "windows": {
-              "pythonPath": "${env:SPARK_HOME}/bin/spark-submit.cmd"
-            },
-            "linux": {
-              "pythonPath": "${env:SPARK_HOME}/bin/spark-submit"
-            },
-            "program": "${file}",
-            "cwd": "${workspaceRoot}",
-            "env": {},
-            "envFile": "${workspaceRoot}/.env",
-            "debugOptions": [
-              "WaitOnAbnormalExit",
-              "WaitOnNormalExit",
-              "RedirectOutput"
-            ]
-          },
-          {
-            "name": "Python: Module",
+            "name": "Python: Attach",
             "type": "python",
-            "request": "launch",
-            "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
-            "module": "module.name",
-            "cwd": "${workspaceRoot}",
-            "env": {},
-            "envFile": "${workspaceRoot}/.env",
-            "debugOptions": [
-              "WaitOnAbnormalExit",
-              "WaitOnNormalExit",
-              "RedirectOutput"
-            ]
+            "request": "attach",
+            "localRoot": "${workspaceRoot}",
+            "remoteRoot": "${workspaceRoot}",
+            "port": 3000,
+            "secret": "my_secret",
+            "host": "localhost"
           },
           {
             "name": "Python: Terminal (integrated)",
@@ -853,6 +820,46 @@
               "RedirectOutput"
             ]
           },
+          {
+            "name": "Python: PySpark",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "osx": {
+              "pythonPath": "${env:SPARK_HOME}/bin/spark-submit"
+            },
+            "windows": {
+              "pythonPath": "${env:SPARK_HOME}/bin/spark-submit.cmd"
+            },
+            "linux": {
+              "pythonPath": "${env:SPARK_HOME}/bin/spark-submit"
+            },
+            "program": "${file}",
+            "cwd": "${workspaceRoot}",
+            "env": {},
+            "envFile": "${workspaceRoot}/.env",
+            "debugOptions": [
+              "WaitOnAbnormalExit",
+              "WaitOnNormalExit",
+              "RedirectOutput"
+            ]
+          },
+          {
+            "name": "Python: Module",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "module": "module.name",
+            "cwd": "${workspaceRoot}",
+            "env": {},
+            "envFile": "${workspaceRoot}/.env",
+            "debugOptions": [
+              "WaitOnAbnormalExit",
+              "WaitOnNormalExit",
+              "RedirectOutput"
+            ]
+          },
           {
             "name": "Python: Pyramid",
             "type": "python",
@@ -892,16 +899,6 @@
               "WaitOnNormalExit",
               "RedirectOutput"
             ]
-          },
-          {
-            "name": "Python: Attach",
-            "type": "python",
-            "request": "attach",
-            "localRoot": "${workspaceRoot}",
-            "remoteRoot": "${workspaceRoot}",
-            "port": 3000,
-            "secret": "my_secret",
-            "host": "localhost"
           }
         ]
       }
@@ -1655,4 +1652,4 @@
     "webpack": "^1.13.2",
     "vscode": "^1.1.5"
   }
-}
+}
\ No newline at end of file

From e92221c5afc8a555c8456ea0739fdcf4cc33a6f1 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@yahoo.com>
Date: Tue, 7 Nov 2017 15:37:41 -0800
Subject: [PATCH 2/2] add new line

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0d1cb713b0a7..20ea9ddd16cc 100644
--- a/package.json
+++ b/package.json
@@ -1652,4 +1652,4 @@
     "webpack": "^1.13.2",
     "vscode": "^1.1.5"
   }
-}
\ No newline at end of file
+}