Add support for Jinja template debugging (microsoft#1211)

DonJayamanne · web-flow · commit 346a1663b78c · 2018-03-27T12:51:56.000-07:00
Fixes microsoft#1210
diff --git a/news/1 Enhancements/1210.md b/news/1 Enhancements/1210.md
@@ -0,0 +1 @@
+Add support for Jinja template debugging.
diff --git a/package.json b/package.json
@@ -806,7 +806,7 @@
                             ],
                             "debugOptions": [
                                 "RedirectOutput",
-                                "Flask"
+                                "Jinja"
                             ]
                         }
                     },
@@ -930,7 +930,7 @@
                                         "RedirectOutput",
                                         "DebugStdLib",
                                         "Django",
-                                        "Flask",
+                                        "Jinja",
                                         "Sudo",
                                         "Pyramid"
                                     ]
@@ -1004,7 +1004,7 @@
                         ],
                         "debugOptions": [
                             "RedirectOutput",
-                            "Flask"
+                            "Jinja"
                         ]
                     },
                     {
diff --git a/src/client/debugger/Common/Contracts.ts b/src/client/debugger/Common/Contracts.ts
@@ -34,7 +34,7 @@ export enum DebugOptions {
     WaitOnNormalExit = 'WaitOnNormalExit',
     RedirectOutput = 'RedirectOutput',
     Django = 'Django',
-    Flask = 'Flask',
+    Jinja = 'Jinja',
     DebugStdLib = 'DebugStdLib',
     BreakOnSystemExitZero = 'BreakOnSystemExitZero',
     Sudo = 'Sudo',
diff --git a/src/client/debugger/configProviders/pythonV2Provider.ts b/src/client/debugger/configProviders/pythonV2Provider.ts
@@ -26,8 +26,8 @@ export class PythonV2DebugConfigurationProvider extends BaseConfigurationProvide
             debugConfiguration.debugOptions.push(DebugOptions.FixFilePathCase);
         }
         if (debugConfiguration.module && debugConfiguration.module.toUpperCase() === 'FLASK'
-            && debugConfiguration.debugOptions.indexOf(DebugOptions.Flask) === -1) {
-            debugConfiguration.debugOptions.push(DebugOptions.Flask);
+            && debugConfiguration.debugOptions.indexOf(DebugOptions.Jinja) === -1) {
+            debugConfiguration.debugOptions.push(DebugOptions.Jinja);
         }
     }
 }
diff --git a/src/test/debugger/configProvider/provider.test.ts b/src/test/debugger/configProvider/provider.test.ts
@@ -356,7 +356,7 @@ import { IServiceContainer } from '../../../client/ioc/types';
 
             expect(debugConfig).to.have.property('debugOptions');
             expect((debugConfig as any).debugOptions).contains(DebugOptions.RedirectOutput);
-            expect((debugConfig as any).debugOptions).contains(DebugOptions.Flask);
+            expect((debugConfig as any).debugOptions).contains(DebugOptions.Jinja);
         });
     });
 });

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Add support for Jinja template debugging.`
Original file line number	Diff line number	Diff line change
`@@ -806,7 +806,7 @@`
`806`	`806`	`],`
`807`	`807`	`"debugOptions": [`
`808`	`808`	`"RedirectOutput",`
`809`		`- "Flask"`
	`809`	`+ "Jinja"`
`810`	`810`	`]`
`811`	`811`	`}`
`812`	`812`	`},`
`@@ -930,7 +930,7 @@`
`930`	`930`	`"RedirectOutput",`
`931`	`931`	`"DebugStdLib",`
`932`	`932`	`"Django",`
`933`		`- "Flask",`
	`933`	`+ "Jinja",`
`934`	`934`	`"Sudo",`
`935`	`935`	`"Pyramid"`
`936`	`936`	`]`
`@@ -1004,7 +1004,7 @@`
`1004`	`1004`	`],`
`1005`	`1005`	`"debugOptions": [`
`1006`	`1006`	`"RedirectOutput",`
`1007`		`- "Flask"`
	`1007`	`+ "Jinja"`
`1008`	`1008`	`]`
`1009`	`1009`	`},`
`1010`	`1010`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ export class PythonV2DebugConfigurationProvider extends BaseConfigurationProvide`
`26`	`26`	`debugConfiguration.debugOptions.push(DebugOptions.FixFilePathCase);`
`27`	`27`	`}`
`28`	`28`	`if (debugConfiguration.module && debugConfiguration.module.toUpperCase() === 'FLASK'`
`29`		`- && debugConfiguration.debugOptions.indexOf(DebugOptions.Flask) === -1) {`
`30`		`- debugConfiguration.debugOptions.push(DebugOptions.Flask);`
	`29`	`+ && debugConfiguration.debugOptions.indexOf(DebugOptions.Jinja) === -1) {`
	`30`	`+ debugConfiguration.debugOptions.push(DebugOptions.Jinja);`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`}`