Fix up compile operation kind

DavidGoldman · DavidGoldman · commit 67a2fe494a0e · 2020-05-18T13:18:40.000-04:00
- `key.compile_operation` instead of `key.compileoperation`
- Make the operation kind optional (nothing emitted for perform sema)
diff --git a/test/SourceKit/CompileNotifications/arg-parsing.swift b/test/SourceKit/CompileNotifications/arg-parsing.swift
@@ -4,7 +4,7 @@
 // ARG_PARSE_0:  key.notification: source.notification.compile-will-start
 // ARG_PARSE_0:  key.compileid: [[CID1:".*"]]
 // ARG_PARSE_0:  key.compilerargs-string: "{{.*}}.swift -no-such-arg"
-// ARG_PARSE_0:  key.compileoperation: source.compile.operation.code-completion
+// ARG_PARSE_0:  key.compile_operation: source.compile.operation.code-completion
 // ARG_PARSE_0: }
 // ARG_PARSE_0: {
 // ARG_PARSE_0:   key.notification: source.notification.compile-did-finish
@@ -16,7 +16,7 @@
 // ARG_PARSE_0:     }
 // ARG_PARSE_0:   ]
 // ARG_PARSE_0:   key.compileid: [[CID1]]
-// ARG_PARSE_0:   key.compileoperation: source.compile.operation.code-completion
+// ARG_PARSE_0:   key.compile_operation: source.compile.operation.code-completion
 // ARG_PARSE_0: }
 // ARG_PARSE_0-NOT: compile-will-start
 // ARG_PARSE_0-NOT: compile-did-finish
@@ -27,7 +27,6 @@
 // ARG_PARSE_1:  key.notification: source.notification.compile-will-start
 // ARG_PARSE_1:  key.compileid: [[CID1:".*"]]
 // ARG_PARSE_1:  key.compilerargs-string: "{{.*}}.swift -no-such-arg"
-// ARG_PARSE_1:  key.compileoperation: source.compile.operation.perform-sema
 // ARG_PARSE_1: }
 // ARG_PARSE_1: {
 // ARG_PARSE_1:   key.notification: source.notification.compile-did-finish
@@ -39,7 +38,6 @@
 // ARG_PARSE_1:     }
 // ARG_PARSE_1:   ]
 // ARG_PARSE_1:   key.compileid: [[CID1]]
-// ARG_PARSE_1:   key.compileoperation: source.compile.operation.perform-sema
 // ARG_PARSE_1: }
 // ARG_PARSE_1-NOT: compile-will-start
 // ARG_PARSE_1-NOT: compile-did-finish
diff --git a/test/SourceKit/CompileNotifications/code-completion.swift b/test/SourceKit/CompileNotifications/code-completion.swift
@@ -3,12 +3,12 @@
 // COMPILE_1:  key.notification: source.notification.compile-will-start,
 // COMPILE_1:  key.filepath: "{{.*}}SOURCE_DIR{{.*}}code-completion.swift",
 // COMPILE_1:  key.compileid: [[CID1:".*"]]
-// COMPILE_1:  key.compileoperation: source.compile.operation.code-completion
+// COMPILE_1:  key.compile_operation: source.compile.operation.code-completion
 // COMPILE_1: }
 // COMPILE_1: {
 // COMPILE_1:   key.notification: source.notification.compile-did-finish,
 // COMPILE_1:   key.compileid: [[CID1]]
-// COMPILE_1:   key.compileoperation: source.compile.operation.code-completion
+// COMPILE_1:   key.compile_operation: source.compile.operation.code-completion
 // COMPILE_1: }
 // COMPILE_1-NOT: compile-will-start
 // COMPILE_1-NOT: compile-did-finish
diff --git a/test/SourceKit/CompileNotifications/cursor-info.swift b/test/SourceKit/CompileNotifications/cursor-info.swift
@@ -3,12 +3,10 @@
 // COMPILE_1:  key.notification: source.notification.compile-will-start,
 // COMPILE_1:  key.filepath: "SOURCE_DIR{{.*}}cursor-info.swift",
 // COMPILE_1:  key.compileid: [[CID1:".*"]]
-// COMPILE_1:  key.compileoperation: source.compile.operation.perform-sema
 // COMPILE_1: }
 // COMPILE_1: {
 // COMPILE_1:   key.notification: source.notification.compile-did-finish,
 // COMPILE_1:   key.compileid: [[CID1]]
-// COMPILE_1:   key.compileoperation: source.compile.operation.perform-sema
 // COMPILE_1: }
 // COMPILE_1: <empty cursor info; internal diagnostic: "Unable to resolve cursor info.">
 // COMPILE_1-NOT: compile-will-start
diff --git a/test/SourceKit/CompileNotifications/edits.swift b/test/SourceKit/CompileNotifications/edits.swift
@@ -4,12 +4,10 @@
 // COMPILE_1: {
 // COMPILE_1:  key.notification: source.notification.compile-will-start,
 // COMPILE_1:  key.compileid: [[CID1:".*"]]
-// COMPILE_1:  key.compileoperation: source.compile.operation.perform-sema
 // COMPILE_1: }
 // COMPILE_1: {
 // COMPILE_1:   key.notification: source.notification.compile-did-finish,
 // COMPILE_1:   key.compileid: [[CID1]]
-// COMPILE_1:   key.compileoperation: source.compile.operation.perform-sema
 // COMPILE_1: }
 // COMPILE_1-NOT: compile-will-start
 // COMPILE_1-NOT: compile-did-finish
@@ -21,32 +19,26 @@
 // COMPILE_3: {
 // COMPILE_3:  key.notification: source.notification.compile-will-start,
 // COMPILE_3:  key.compileid: [[CID1:".*"]]
-// COMPILE_3:  key.compileoperation: source.compile.operation.perform-sema
 // COMPILE_3: }
 // COMPILE_3: {
 // COMPILE_3:   key.notification: source.notification.compile-did-finish,
 // COMPILE_3:   key.compileid: [[CID1]]
-// COMPILE_3:   key.compileoperation: source.compile.operation.perform-sema
 // COMPILE_3: }
 // COMPILE_3: {
 // COMPILE_3:  key.notification: source.notification.compile-will-start,
 // COMPILE_3:  key.compileid: [[CID2:".*"]]
-// COMPILE_3:  key.compileoperation: source.compile.operation.perform-sema
 // COMPILE_3: }
 // COMPILE_3: {
 // COMPILE_3:   key.notification: source.notification.compile-did-finish,
 // COMPILE_3:   key.compileid: [[CID2]]
-// COMPILE_3:   key.compileoperation: source.compile.operation.perform-sema
 // COMPILE_3: }
 // COMPILE_3: {
 // COMPILE_3:  key.notification: source.notification.compile-will-start,
 // COMPILE_3:  key.compileid: [[CID3:".*"]]
-// COMPILE_3:  key.compileoperation: source.compile.operation.perform-sema
 // COMPILE_3: }
 // COMPILE_3: {
 // COMPILE_3:   key.notification: source.notification.compile-did-finish,
 // COMPILE_3:   key.compileid: [[CID3]]
-// COMPILE_3:   key.compileoperation: source.compile.operation.perform-sema
 // COMPILE_3: }
 // COMPILE_3-NOT: compile-will-start
 // COMPILE_3-NOT: compile-did-finish
diff --git a/tools/SourceKit/tools/sourcekitd/lib/API/Requests.cpp b/tools/SourceKit/tools/sourcekitd/lib/API/Requests.cpp
@@ -3181,19 +3181,18 @@ class CompileTrackingConsumer final : public trace::TraceConsumer {
 };
 } // end anonymous namespace
 
-static UIdent getUIDForOperationKind(trace::OperationKind OpKind) {
-  static UIdent CompileOperationPerformSema("source.compile.operation.perform-sema");
+static Optional<UIdent> getUIDForOperationKind(trace::OperationKind OpKind) {
   static UIdent CompileOperationIndexSource("source.compile.operation.index-source");
   static UIdent CompileOperationCodeCompletion("source.compile.operation.code-completion");
   switch (OpKind) {
     case trace::OperationKind::PerformSema:
-      return CompileOperationPerformSema;
+      return None;
     case trace::OperationKind::IndexSource:
       return CompileOperationIndexSource;
     case trace::OperationKind::CodeCompletion:
       return CompileOperationCodeCompletion;
     case trace::OperationKind::All:
-      return CompileOperationPerformSema;
+      return None;
   }
 }
 
@@ -3209,7 +3208,9 @@ void CompileTrackingConsumer::operationStarted(
   Dict.set(KeyNotification, CompileWillStartUID);
   Dict.set(KeyCompileID, std::to_string(OpId));
   Dict.set(KeyFilePath, Inv.Args.PrimaryFile);
-  Dict.set(KeyCompileOperation, getUIDForOperationKind(OpKind));
+  if (auto OperationUID = getUIDForOperationKind(OpKind)) {
+    Dict.set(KeyCompileOperation, OperationUID.getValue());
+  }
   Dict.set(KeyCompilerArgsString, Inv.Args.Arguments);
   sourcekitd::postNotification(RespBuilder.createResponse());
 }
@@ -3225,7 +3226,9 @@ void CompileTrackingConsumer::operationFinished(
   auto Dict = RespBuilder.getDictionary();
   Dict.set(KeyNotification, CompileDidFinishUID);
   Dict.set(KeyCompileID, std::to_string(OpId));
-  Dict.set(KeyCompileOperation, getUIDForOperationKind(OpKind));
+  if (auto OperationUID = getUIDForOperationKind(OpKind)) {
+    Dict.set(KeyCompileOperation, OperationUID.getValue());
+  }
   auto DiagArray = Dict.setArray(KeyDiagnostics);
   for (const auto &DiagInfo : Diagnostics) {
     fillDictionaryForDiagnosticInfo(DiagArray.appendDictionary(), DiagInfo);
diff --git a/utils/gyb_sourcekit_support/UIDs.py b/utils/gyb_sourcekit_support/UIDs.py
@@ -182,7 +182,7 @@ def __init__(self, internal_name, external_name):
     KEY('CompletionCheckDependencyInterval',
         'key.completion_check_dependency_interval'),
     KEY('AnnotatedTypename', 'key.annotated.typename'),
-    KEY('CompileOperation', 'key.compileoperation'),
+    KEY('CompileOperation', 'key.compile_operation'),
 ]
 
 

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ def __init__(self, internal_name, external_name):`
`182`	`182`	`KEY('CompletionCheckDependencyInterval',`
`183`	`183`	`'key.completion_check_dependency_interval'),`
`184`	`184`	`KEY('AnnotatedTypename', 'key.annotated.typename'),`
`185`		`- KEY('CompileOperation', 'key.compileoperation'),`
	`185`	`+ KEY('CompileOperation', 'key.compile_operation'),`
`186`	`186`	`]`
`187`	`187`
`188`	`188`