Fix source maps

.vscode/launch.json

@@ -8,16 +8,12 @@
       "request": "launch",
       "runtimeExecutable": "${execPath}",
       "args": [
-        "--extensionDevelopmentPath=${workspaceRoot}/dist/vscode-codeql"
+        "--extensionDevelopmentPath=${workspaceRoot}/extensions/ql-vscode"
       ],
       "stopOnEntry": false,
       "sourceMaps": true,
       "outFiles": [
-        "${workspaceRoot}/dist/vscode-codeql/out/**/*.js",
-        "${workspaceRoot}/dist/vscode-codeql/node_modules/semmle-bqrs/out/**/*.js",
-        "${workspaceRoot}/dist/vscode-codeql/node_modules/semmle-io/out/**/*.js",
-        "${workspaceRoot}/dist/vscode-codeql/node_modules/semmle-io-node/out/**/*.js",
-        "${workspaceRoot}/dist/vscode-codeql/node_modules/@github/codeql-vscode-utils/out/**/*.js"
+        "${workspaceRoot}/extensions/ql-vscode/out/**/*.js",
       ],
       "preLaunchTask": "Build"
     },
@@ -54,13 +50,13 @@
       "request": "launch",
       "runtimeExecutable": "${execPath}",
       "args": [
-        "--extensionDevelopmentPath=${workspaceRoot}/dist/vscode-codeql",
+        "${workspaceRoot}/extensions/ql-vscode/out/**/*.js",
         "--extensionTestsPath=${workspaceRoot}/extensions/ql-vscode/out/vscode-tests/no-workspace/index"
       ],
       "stopOnEntry": false,
       "sourceMaps": true,
       "outFiles": [
-        "${workspaceRoot}/dist/vscode-codeql/out/**/*.js",
+        "${workspaceRoot}/extensions/ql-vscode/out/**/*.js",
         "${workspaceRoot}/extensions/ql-vscode/out/vscode-tests/**/*.js"
       ],
       "preLaunchTask": "Build"
@@ -71,14 +67,14 @@
       "request": "launch",
       "runtimeExecutable": "${execPath}",
       "args": [
-        "--extensionDevelopmentPath=${workspaceRoot}/dist/vscode-codeql",
+        "${workspaceRoot}/extensions/ql-vscode/out/**/*.js",
         "--extensionTestsPath=${workspaceRoot}/extensions/ql-vscode/out/vscode-tests/minimal-workspace/index",
         "${workspaceRoot}/extensions/ql-vscode/test/data"
       ],
       "stopOnEntry": false,
       "sourceMaps": true,
       "outFiles": [
-        "${workspaceRoot}/dist/vscode-codeql/out/**/*.js",
+        "${workspaceRoot}/extensions/ql-vscode/out/**/*.js",
         "${workspaceRoot}/extensions/ql-vscode/out/vscode-tests/**/*.js"
       ],
       "preLaunchTask": "Build"

extensions/ql-vscode/gulpfile.ts/typescript.ts

@@ -1,6 +1,5 @@
 import * as colors from 'ansi-colors';
 import * as gulp from 'gulp';
-import * as path from 'path';
 import * as sourcemaps from 'gulp-sourcemaps';
 import * as ts from 'gulp-typescript';
 
@@ -25,16 +24,9 @@ export function compileTypeScript() {
   return tsProject.src()
     .pipe(sourcemaps.init())
     .pipe(tsProject(goodReporter()))
-    .pipe((sourcemaps as any).mapSources((sourcePath: string, _file: string) => {
-      // The source path is kind of odd, because it's relative to the `tsconfig.json` file in the
-      // `typescript-config` package, which lives in the `node_modules` directory of the package
-      // that is being built. It starts out as something like '../../../src/foo.ts', and we need to
-      // strip out the leading '../../../'.
-      return path.join('a/b/c', sourcePath);
-    }))
     .pipe(sourcemaps.write('.', {
       includeContent: false,
-      sourceRoot: '.', // XXX this is probably wrong
+      sourceRoot: '.',
     }))
     .pipe(gulp.dest('out'));
 }