Add unit tests (will conflict with microsoft#4241)

Author: kimadeline

src/client/extension.ts

@@ -112,6 +112,9 @@ durations.codeLoadingTime = stopWatch.elapsedTime;
 const activationDeferred = createDeferred<void>();
 let activatedServiceContainer: ServiceContainer | undefined;
 
+export const INCREASE_INDENT_REGEX = /^\s*(?:def|class|for|if|elif|else|while|try|with|finally|except|async)\b.*:\s*/;
+export const DECREASE_INDENT_REGEX = /^\s*(?:elif|else)\b.*:\s*/;
+
 export async function activate(context: ExtensionContext): Promise<IExtensionApi> {
     try {
         return await activateUnsafe(context);
@@ -193,8 +196,8 @@ async function activateUnsafe(context: ExtensionContext): Promise<IExtensionApi>
             }
         ],
         indentationRules: {
-            increaseIndentPattern: /^\s*(?:def|class|for|if|elif|else|while|try|with|finally|except|async)\b.*:\s*/,
-            decreaseIndentPattern: /^\s*(?:elif|else)\b.*:\s*/
+            increaseIndentPattern: INCREASE_INDENT_REGEX,
+            decreaseIndentPattern: DECREASE_INDENT_REGEX
         }
     });
 

src/test/extension.unit.test.ts

@@ -6,9 +6,16 @@
 // tslint:disable:no-any
 
 import { expect } from 'chai';
+import * as sinon from 'sinon';
 import { buildApi } from '../client/api';
 import { EXTENSION_ROOT_DIR } from '../client/common/constants';
 
+// Stub sourceMapSupport.initialize before we import from extension.ts (we don't actually need it)
+// tslint:disable-next-line: no-require-imports no-var-requires
+const sourceMapSupport = require('../client/sourceMapSupport');
+sinon.stub(sourceMapSupport, 'initialize');
+import { DECREASE_INDENT_REGEX, INCREASE_INDENT_REGEX } from '../client/extension';
+
 const expectedPath = `${EXTENSION_ROOT_DIR.fileToCommandArgument()}/pythonFiles/ptvsd_launcher.py`;
 
 suite('Extension API Debugger', () => {
@@ -22,4 +29,84 @@ suite('Extension API Debugger', () => {
         const expectedArgs = [expectedPath, '--default', '--host', 'something', '--port', '1234', '--wait'];
         expect(args).to.be.deep.equal(expectedArgs);
     });
+    [
+        {
+            keyword: 'def',
+            line: 'def foo:',
+            dedent: false
+        },
+        {
+            keyword: 'class',
+            line: 'class TestClass:',
+            dedent: false
+        },
+        {
+            keyword: 'for',
+            line: 'for item in items:',
+            dedent: false
+        },
+        {
+            keyword: 'if',
+            line: 'if foo is None:',
+            dedent: false
+        },
+        {
+            keyword: 'elif',
+            line: 'elif x < 5:',
+            dedent: true
+        },
+        {
+            keyword: 'else',
+            line: 'else:',
+            dedent: true
+        },
+        {
+            keyword: 'while',
+            line: 'while \'::\' in macaddress:',
+            dedent: false
+        },
+        {
+            keyword: 'try',
+            line: 'try:',
+            dedent: false
+        },
+        {
+            keyword: 'with',
+            line: 'with self.test:',
+            dedent: false
+        },
+        {
+            keyword: 'finally',
+            line: 'finally:',
+            dedent: false
+        },
+        {
+            keyword: 'except',
+            line: 'except TestError:',
+            dedent: false
+        },
+        {
+            keyword: 'async',
+            line: 'async def test(self):',
+            dedent: false
+        }
+    ].forEach(({keyword, line, dedent}) => {
+        test(`Increase indent regex should pick up lines containing the ${keyword} keyword`, async () => {
+            const result = INCREASE_INDENT_REGEX.test(line);
+            expect(result).to.be.equal(true, `Increase indent regex should pick up lines containing the ${keyword} keyword`);
+        });
+
+        test(`Decrease indent regex should ${dedent ? '' : 'not '}pick up lines containing the ${keyword} keyword`, async () => {
+            const result = DECREASE_INDENT_REGEX.test(line);
+            expect(result).to.be.equal(dedent, `Decrease indent regex should ${dedent ? '' : 'not '}pick up lines containing the ${keyword} keyword`);
+        });
+    });
+    test('Increase indent regex should not pick up lines without keywords', async () => {
+        const result = INCREASE_INDENT_REGEX.test('a = \'hello \\n \'');
+        expect(result).to.be.equal(false, 'Increase indent regex should not pick up lines without keywords');
+    });
+    test('Decrease indent regex should not pick up lines without keywords', async () => {
+        const result = DECREASE_INDENT_REGEX.test('a = \'hello \\n \'');
+        expect(result).to.be.equal(false, 'Decrease indent regex should not pick up lines without keywords');
+    });
 });