Cleanup unused code

Author: Paul Johnston

compdb/postprocess.py

@@ -17,7 +17,7 @@
 """Generates a compile_commands.json file at $(bazel info workspace) for
 libclang based tools.
 
-This is modified from
+Derived from
 https://github.com/grailbio/bazel-compilation-database/blob/08d706d3cf7daf3d529a26ca76d75da1a3eae6c0/generate.py
 """
 
@@ -29,26 +29,6 @@
 import tempfile
 
 
-# _BAZEL = os.getenv("BAZEL_COMPDB_BAZEL_PATH") or "bazel"
-
-# def bazel_info():
-#     """Returns a dict containing key values from bazel info."""
-
-#     bazel_info_dict = dict()
-#     try:
-#         out = subprocess.check_output([_BAZEL, 'info', 'execution_root', 'workspace', 'bazel-bin']).decode('utf-8').strip().split('\n')
-#     except subprocess.CalledProcessError as err:
-#         # This exit code is returned when this command is run outside of a bazel workspace.
-#         if err.returncode == 2:
-#             sys.exit(0)
-#         sys.exit(err.returncode)
-
-#     for line in out:
-#         key_val = line.strip().partition(": ")
-#         bazel_info_dict[key_val[0]] = key_val[2]
-
-#     return bazel_info_dict
-
 if __name__ == "__main__":
     ##
     ## Setup Args
@@ -60,45 +40,27 @@
                         help="build events json file from the compilation aspect")
     args = parser.parse_args()
 
-    ##
-    ## Setup Bazel Metadata
-    ##
-    # print("Gathering bazel info...")
-    # bazel_info_dict = bazel_info()
-    # bazel_exec_root = bazel_info_dict['execution_root']
-    # bazel_workspace = bazel_info_dict['workspace']
-
-    # want 'bazel-out/darwin-fastbuild/bin'
-    # bazel_bin = bazel_info_dict['bazel-bin']
-    # if bazel_bin.startswith(bazel_exec_root):
-    #     bazel_bin = bazel_bin[len(bazel_exec_root)+1:]
-
     ##
     ## Parse Build Events
     ##
     print("Gathering output files...")
+
     local_exec_root = '__EXEC_ROOT__'
     workspace_directory = '__WORKSPACE__'
-    build_events = []
     bazel_stderr = []
     with open(args.build_events_json_file, 'r') as f:
         for line in f:
-            # print(line)
             event = json.loads(line)
             if 'started' in event:
                 workspace_directory = event['started']['workspaceDirectory']
                 print("Workspace Directory:", workspace_directory)
             elif 'progress' in event:
                 if 'stderr' in event['progress']:                  
-                    # print(event['progress']['stderr'])
                     bazel_stderr.extend(event['progress']['stderr'].splitlines())
-                
             elif 'workspaceInfo' in event:
                 local_exec_root = event['workspaceInfo']['localExecRoot']
                 print('Execution Root:', local_exec_root)
 
-            build_events.append(event)
-
     compile_command_json_db_files = []
     for line in bazel_stderr:
         if line.endswith('.compile_commands.json'):
@@ -107,31 +69,31 @@
     ##
     ## Collect/Fix/Merge Compilation Databases
     ##
-    print("Collecting target databases...")
+    print("Preparing compilation database...")
+
     db_entries = []
     for db in compile_command_json_db_files:
             with open(db, 'r') as f:
                 db_entries.extend(json.load(f))
 
-    print("Fixing up commands...")
     def fix_db_entry(db_entry):
         if 'directory' in db_entry and db_entry['directory'] == '__EXEC_ROOT__':
             db_entry['directory'] = bazel_workspace if args.source_dir else local_exec_root
+        # TODO: research better if this is advantageous
         # if 'file' in db_entry and db_entry['file'].startswith(bazel_bin):
         #     db_entry['file'] = db_entry['file'][len(bazel_bin)+1:]
         if 'command' in db_entry:
             command = db_entry['command']
             if command:
                 command = command.replace('-isysroot __BAZEL_XCODE_SDKROOT__', '')
+                # -iquote seems to misbehave with vscode
                 command = command.replace('-iquote', '-I')
                 db_entry['command'] = command
         return db_entry
     db_entries = list(map(fix_db_entry, db_entries))
 
     compdb_file = os.path.join(workspace_directory, "compile_commands.json")
 
-    # os.chdir(bazel_workspace)
-
     with open(compdb_file, 'w') as outdb:
         json.dump(db_entries, outdb, indent=2)
 

package.json

@@ -26,7 +26,6 @@
 		"Other"
 	],
 	"activationEvents": [
-		"onView:bsv.bzl.bep",
 		"onCommand:bsv.cc.compdb.generate"
 	],
 	"extensionDependencies": [

src/compilation_database.ts

@@ -25,7 +25,7 @@ export class CompilationDatabase implements vscode.Disposable {
         vscode.window.showInformationMessage('Building clang compilation database for ' + JSON.stringify(targets));
 
         const execution = await vscode.tasks.executeTask(new GenerateCompilationDatabaseCommand(
-            "bazel-vscode-compdb",
+            "bazel-compdb",
             bazel,
             Container.file("compdb/"),
             targets,
@@ -99,10 +99,6 @@ class GenerateCompilationDatabaseCommand {
             env: this.env,
             cwd: this.cwd,
         });
-        // const execution = new vscode.ProcessExecution(this.bazel, this.makeCommand(), {
-        //     env: this.env,
-        //     cwd: this.cwd,
-        // });
         const task = new vscode.Task(taskDefinition, scope, this.name, source, execution);
         task.presentationOptions = {
             clear: true,