Fixed debugging for Mac

Author: DonJayamanne

README.md

@@ -9,15 +9,14 @@ Works on both Windows and Mac.
 * Renaming, Viewing references, Going to definitions, Go to Symbols
 * View signature and similar by hovering over a function or method
 * Debugging with support for local variables, arguments, expressions, watch window, stack information, break points
-* Debugging Multiple threads (Web Applications, etc) and expanding values in watch windows is supported on Windows
+* Debugging Multiple threads (Web Applications, etc) and expanding values (on Windows and Mac)
 * Unit testing (unittests and nosetests, with config files)
 * Sorting imports
 * Snippets
 
 ## Issues and Feature Requests 
 [Github Issues](https://github.com/DonJayamanne/pythonVSCode/issues)
 * Remote Debugging (coming soon)
-* Improved debugging for Mac (in development)
 
 ## Feature Details (with confiuration)
 * IDE Features
@@ -35,8 +34,7 @@ Works on both Windows and Mac.
 ```json
 "python.autoComplete.extraPaths": [
     "C:/Program Files (x86)/Google/google_appengine",
-    "C:/Program Files (x86)/Google/google_appengine/lib"
-    ]
+    "C:/Program Files (x86)/Google/google_appengine/lib" ]
 ```
 * Code formatting
 * - Use either yapf or autopep8 for code formatting (defaults to autopep8)
@@ -59,8 +57,8 @@ Works on both Windows and Mac.
 * - Step through code (Step in, Step out, Continue)
 * - Add/remove break points
 * - Local variables and arguments
-* - Multiple Threads and Web Applications (such as Flask) (only Windows at this stage)
-* - Expanding values (viewing children, properties, etc) again only Windows at this Stage
+* - Multiple Threads and Web Applications (such as Flask) (Windows and Mac)
+* - Expanding values (viewing children, properties, etc) (Windows and Mac)
 * Unit Testing
 * - unittests (default is on)
 * - nosetests (default is off)
@@ -98,6 +96,11 @@ Works on both Windows and Mac.
 
 ## Change Log
 
+### Version 0.2.2
+* Improved debugger for Mac, with support for Multi threading, Web Applications, expanding properties, etc
+* (Debugging now works on both Windows and Mac)
+* Debugging no longer uses PDB
+
 ### Version 0.2.1
 * Improved debugger for Windows, with support for Multi threading, debugging Multi-threaded apps, Web Applications, expanding properties, etc
 * Added support for relative paths for extra paths in additional libraries for Auto Complete

package.json

@@ -2,7 +2,7 @@
     "name": "python",
     "displayName": "Python",
     "description": "Linting, Debugging (multi-threaded), Intellisense, auto-completion, code formatting, snippets, and more.",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "publisher": "donjayamanne",
     "license": "SEE LICENSE IN LICENSE or README.MD",
     "homepage": "https://github.com/DonJayamanne/pythonVSCode/blob/master/README.md",
@@ -54,56 +54,7 @@
         "debuggers": [
             {
                 "type": "python",
-                "label": "Python (pdb)",
-                "enableBreakpointsFor": {
-                    "languageIds": [
-                        "python"
-                    ]
-                },
-                "program": "./out/client/debugger/pdb/debuggerMain.js",
-                "runtime": "node",
-                "configurationAttributes": {
-                    "launch": {
-                        "required": [
-                            "program"
-                        ],
-                        "properties": {
-                            "program": {
-                                "type": "string",
-                                "description": "Workspace relative path to a text file.",
-                                "default": "__init__.py"
-                            },
-                            "pythonPath": {
-                                "type": "string",
-                                "description": "Path (fully qualified) to python executable. Use this if you want to use a custom pthon executable version.",
-                                "default": ""
-                            },
-                            "stopOnEntry": {
-                                "type": "boolean",
-                                "description": "Automatically stop after launch.",
-                                "default": true
-                            },
-                            "args": {
-                                "type": "array",
-                                "description": "List of arguments for the program",
-                                "default": []
-                            }
-                        }
-                    }
-                },
-                "initialConfigurations": [
-                    {
-                        "name": "Python (Pdb)",
-                        "type": "python",
-                        "request": "launch",
-                        "program": "__init__.py",
-                        "stopOnEntry": true
-                    }
-                ]
-            },
-            {
-                "type": "python_windows",
-                "label": "Python (Windows)",
+                "label": "Python",
                 "enableBreakpointsFor": {
                     "languageIds": [
                         "python"
@@ -137,9 +88,10 @@
                 },
                 "initialConfigurations": [
                     {
-                        "name": "Python (Windows)",
-                        "type": "python_windows",
+                        "name": "Python",
+                        "type": "python",
                         "request": "launch",
+                        "stopOnEntry": true,
                         "program": "__init__.py"
                     }
                 ]
@@ -306,9 +258,9 @@
         "compile": "node ./node_modules/vscode/bin/compile  -watch -p ./ && installServerIntoExtension ./out ./src/server/package.json ./src/server/tsconfig.json"
     },
     "dependencies": {
-        "long": "^3.0.3",
         "named-js-regexp": "^1.3.1",
         "tmp": "0.0.28",
+        "uint64be": "^1.0.1",
         "vscode-debugadapter": "^1.0.1",
         "vscode-debugprotocol": "^1.0.1",
         "vscode-languageclient": "^1.1.0",

src/client/debugger/vs/Common/BufferReader.ts

@@ -1,5 +1,5 @@
 import * as net from 'net';
-var long = require("long");
+var uint64be = require("uint64be");
 
 
 export class SocketStream {
@@ -14,25 +14,7 @@ export class SocketStream {
     }
 
     public WriteInt64(num: number) {
-        //convert to long
-        var longNumber = long.fromNumber(num, true);
-    
-        // Can't use BitConverter because we need to convert big-endian to little-endian here,
-        // and BitConverter.IsLittleEndian is platform-dependent (and usually true).    
-        var hi = longNumber.shiftRight(0x20).toInt()
-        var lo = longNumber.and(0xFFFFFFFF).toInt();
-        var buf = [
-            <number>((hi >> 0x18) & 0xFF),
-            <number>((hi >> 0x10) & 0xFF),
-            <number>((hi >> 0x08) & 0xFF),
-            <number>((hi >> 0x00) & 0xFF),
-            <number>((lo >> 0x18) & 0xFF),
-            <number>((lo >> 0x10) & 0xFF),
-            <number>((lo >> 0x08) & 0xFF),
-            <number>((lo >> 0x00) & 0xFF)
-        ];
-
-        var buffer = new Buffer(buf);
+        var buffer = uint64be.encode(num);
         this.socket.write(buffer);
     }
     public WriteString(value: string) {
@@ -186,13 +168,8 @@ export class SocketStream {
         else {
             this.buffer = this.buffer.slice(8);
         }
-        
-        // Can't use BitConverter because we need to convert big-endian to little-endian here,
-        // and BitConverter.IsLittleEndian is platform-dependent (and usually true).
-        var hi = <number>((buf[0] << 0x18) | (buf[1] << 0x10) | (buf[2] << 0x08) | (buf[3] << 0x00));
-        var lo = <number>((buf[4] << 0x18) | (buf[5] << 0x10) | (buf[6] << 0x08) | (buf[7] << 0x00));
-        var returnValue = <number>((hi << 0x20) | lo);
 
+        var returnValue = uint64be.decode(buf);
         return returnValue;
     }