Rename Skylark to Starlark in build/lib/starlarkdebug/...
RELNOTES: None.
PiperOrigin-RevId: 308865253
diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index 4c79bf9..b8f9a92 100755
--- a/scripts/bootstrap/compile.sh
+++ b/scripts/bootstrap/compile.sh
@@ -21,7 +21,7 @@
else
PROTOBUF_JARS="/usr/share/java/protobuf.jar /usr/share/java/protobuf-java-util.jar"
fi
-PROTO_FILES=$(find third_party/remoteapis third_party/googleapis third_party/pprof src/main/protobuf src/main/java/com/google/devtools/build/lib/buildeventstream/proto src/main/java/com/google/devtools/build/skyframe src/main/java/com/google/devtools/build/lib/skyframe/proto src/main/java/com/google/devtools/build/lib/bazel/debug src/main/java/com/google/devtools/build/lib/skylarkdebug/proto -name "*.proto")
+PROTO_FILES=$(find third_party/remoteapis third_party/googleapis third_party/pprof src/main/protobuf src/main/java/com/google/devtools/build/lib/buildeventstream/proto src/main/java/com/google/devtools/build/skyframe src/main/java/com/google/devtools/build/lib/skyframe/proto src/main/java/com/google/devtools/build/lib/bazel/debug src/main/java/com/google/devtools/build/lib/starlarkdebug/proto -name "*.proto")
LIBRARY_JARS=$(find $PROTOBUF_JARS third_party -name '*.jar' | grep -Fv JavaBuilder | grep -Fv third_party/guava | grep -Fv third_party/guava | grep -ve 'third_party/grpc/grpc.*jar' | tr "\n" " ")
GRPC_JAVA_VERSION=1.20.0
GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e ".*${GRPC_JAVA_VERSION}.*jar" | tr "\n" " ")
@@ -236,7 +236,7 @@
-Isrc/main/java/com/google/devtools/build/lib/skyframe/proto/ \
-Isrc/main/java/com/google/devtools/build/skyframe/ \
-Isrc/main/java/com/google/devtools/build/lib/bazel/debug/ \
- -Isrc/main/java/com/google/devtools/build/lib/skylarkdebug/proto/ \
+ -Isrc/main/java/com/google/devtools/build/lib/starlarkdebug/proto/ \
-Ithird_party/remoteapis/ \
-Ithird_party/googleapis/ \
-Ithird_party/pprof/ \
diff --git a/src/BUILD b/src/BUILD
index f2a1bae..8a87565 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -482,7 +482,7 @@
"//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:dist_jars",
"//src/main/java/com/google/devtools/build/lib/bazel/debug:dist_jars",
"//src/main/java/com/google/devtools/build/lib/skyframe/proto:dist_jars",
- "//src/main/java/com/google/devtools/build/lib/skylarkdebug/proto:dist_jars",
+ "//src/main/java/com/google/devtools/build/lib/starlarkdebug/proto:dist_jars",
"//src/main/java/com/google/devtools/build/skydoc/rendering/proto:dist_jars",
"//src/main/java/com/google/devtools/build/skyframe:dist_jars",
"@googleapis//:dist_jars",
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index cfbafa4..45234a9 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -76,9 +76,9 @@
"//src/main/java/com/google/devtools/build/lib/shell:srcs",
"//src/main/java/com/google/devtools/build/lib/skyframe:srcs",
"//src/main/java/com/google/devtools/build/lib/skylarkbuildapi:srcs",
- "//src/main/java/com/google/devtools/build/lib/skylarkdebug/module:srcs",
- "//src/main/java/com/google/devtools/build/lib/skylarkdebug/proto:srcs",
- "//src/main/java/com/google/devtools/build/lib/skylarkdebug/server:srcs",
+ "//src/main/java/com/google/devtools/build/lib/starlarkdebug/module:srcs",
+ "//src/main/java/com/google/devtools/build/lib/starlarkdebug/proto:srcs",
+ "//src/main/java/com/google/devtools/build/lib/starlarkdebug/server:srcs",
"//src/main/java/com/google/devtools/build/lib/skylarkinterface/processor:srcs",
"//src/main/java/com/google/devtools/build/lib/skylarkinterface:srcs",
"//src/main/java/com/google/devtools/build/lib/ssd:srcs",
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/BUILD
index 432f262..e46fbcd 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/bazel/BUILD
@@ -111,9 +111,9 @@
"//src/main/java/com/google/devtools/build/lib/profiler/memory:allocationtracker_module",
"//src/main/java/com/google/devtools/build/lib/remote",
"//src/main/java/com/google/devtools/build/lib/sandbox",
- "//src/main/java/com/google/devtools/build/lib/skylarkdebug/module",
"//src/main/java/com/google/devtools/build/lib/ssd",
"//src/main/java/com/google/devtools/build/lib/standalone",
+ "//src/main/java/com/google/devtools/build/lib/starlarkdebug/module",
"//src/main/java/com/google/devtools/build/lib/worker",
"//third_party:guava",
],
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/Bazel.java b/src/main/java/com/google/devtools/build/lib/bazel/Bazel.java
index c75106b..4afe97c 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/Bazel.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/Bazel.java
@@ -53,7 +53,7 @@
com.google.devtools.build.lib.bazel.debug.WorkspaceRuleModule.class,
com.google.devtools.build.lib.bazel.coverage.BazelCoverageReportModule.class,
com.google.devtools.build.lib.collect.nestedset.NestedSetOptionsModule.class,
- com.google.devtools.build.lib.skylarkdebug.module.SkylarkDebuggerModule.class,
+ com.google.devtools.build.lib.starlarkdebug.module.StarlarkDebuggerModule.class,
com.google.devtools.build.lib.bazel.repository.RepositoryResolvedModule.class,
com.google.devtools.build.lib.bazel.repository.CacheHitReportingModule.class,
com.google.devtools.build.lib.bazel.SpawnLogModule.class,
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/module/BUILD b/src/main/java/com/google/devtools/build/lib/starlarkdebug/module/BUILD
similarity index 80%
rename from src/main/java/com/google/devtools/build/lib/skylarkdebug/module/BUILD
rename to src/main/java/com/google/devtools/build/lib/starlarkdebug/module/BUILD
index db2d99b..edab2b8 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/module/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdebug/module/BUILD
@@ -10,13 +10,13 @@
java_library(
name = "module",
- srcs = ["SkylarkDebuggerModule.java"],
+ srcs = ["StarlarkDebuggerModule.java"],
deps = [
":options",
"//src/main/java/com/google/devtools/build/lib:runtime",
"//src/main/java/com/google/devtools/build/lib:syntax",
"//src/main/java/com/google/devtools/build/lib/events",
- "//src/main/java/com/google/devtools/build/lib/skylarkdebug/server",
+ "//src/main/java/com/google/devtools/build/lib/starlarkdebug/server",
"//src/main/java/com/google/devtools/common/options",
"//third_party:guava",
],
@@ -24,7 +24,7 @@
java_library(
name = "options",
- srcs = ["SkylarkDebuggerOptions.java"],
+ srcs = ["StarlarkDebuggerOptions.java"],
deps = [
"//src/main/java/com/google/devtools/common/options",
],
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/module/SkylarkDebuggerModule.java b/src/main/java/com/google/devtools/build/lib/starlarkdebug/module/StarlarkDebuggerModule.java
similarity index 81%
rename from src/main/java/com/google/devtools/build/lib/skylarkdebug/module/SkylarkDebuggerModule.java
rename to src/main/java/com/google/devtools/build/lib/starlarkdebug/module/StarlarkDebuggerModule.java
index 2b59297..aa51a66 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/module/SkylarkDebuggerModule.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdebug/module/StarlarkDebuggerModule.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.build.lib.skylarkdebug.module;
+package com.google.devtools.build.lib.starlarkdebug.module;
import com.google.common.collect.ImmutableList;
import com.google.devtools.build.lib.events.Event;
@@ -20,17 +20,18 @@
import com.google.devtools.build.lib.runtime.BlazeModule;
import com.google.devtools.build.lib.runtime.Command;
import com.google.devtools.build.lib.runtime.CommandEnvironment;
-import com.google.devtools.build.lib.skylarkdebug.server.SkylarkDebugServer;
+import com.google.devtools.build.lib.starlarkdebug.server.StarlarkDebugServer;
import com.google.devtools.build.lib.syntax.Debug;
import com.google.devtools.common.options.OptionsBase;
import java.io.IOException;
/** Blaze module for setting up Starlark debugging. */
-public final class SkylarkDebuggerModule extends BlazeModule {
+public final class StarlarkDebuggerModule extends BlazeModule {
@Override
public void beforeCommand(CommandEnvironment env) {
// Conditionally enable debugging
- SkylarkDebuggerOptions buildOptions = env.getOptions().getOptions(SkylarkDebuggerOptions.class);
+ StarlarkDebuggerOptions buildOptions =
+ env.getOptions().getOptions(StarlarkDebuggerOptions.class);
boolean enabled = buildOptions != null && buildOptions.debugSkylark;
if (enabled) {
initializeDebugging(
@@ -48,7 +49,7 @@
@Override
public Iterable<Class<? extends OptionsBase>> getCommandOptions(Command command) {
return "build".equals(command.name())
- ? ImmutableList.of(SkylarkDebuggerOptions.class)
+ ? ImmutableList.of(StarlarkDebuggerOptions.class)
: ImmutableList.of();
}
@@ -64,8 +65,8 @@
private static void initializeDebugging(Reporter reporter, int debugPort, boolean verboseLogs) {
try {
- SkylarkDebugServer server =
- SkylarkDebugServer.createAndWaitForConnection(reporter, debugPort, verboseLogs);
+ StarlarkDebugServer server =
+ StarlarkDebugServer.createAndWaitForConnection(reporter, debugPort, verboseLogs);
Debug.setDebugger(server);
} catch (IOException e) {
reporter.handle(Event.error("Error while setting up the debug server: " + e.getMessage()));
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/module/SkylarkDebuggerOptions.java b/src/main/java/com/google/devtools/build/lib/starlarkdebug/module/StarlarkDebuggerOptions.java
similarity index 94%
rename from src/main/java/com/google/devtools/build/lib/skylarkdebug/module/SkylarkDebuggerOptions.java
rename to src/main/java/com/google/devtools/build/lib/starlarkdebug/module/StarlarkDebuggerOptions.java
index 788f8a9..0d2b6c2 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/module/SkylarkDebuggerOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdebug/module/StarlarkDebuggerOptions.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.build.lib.skylarkdebug.module;
+package com.google.devtools.build.lib.starlarkdebug.module;
import com.google.devtools.common.options.Option;
import com.google.devtools.common.options.OptionDocumentationCategory;
@@ -21,7 +21,7 @@
import com.google.devtools.common.options.OptionsBase;
/** Configuration options for Starlark debugging. */
-public final class SkylarkDebuggerOptions extends OptionsBase {
+public final class StarlarkDebuggerOptions extends OptionsBase {
@Option(
name = "experimental_skylark_debug",
defaultValue = "false",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/proto/BUILD b/src/main/java/com/google/devtools/build/lib/starlarkdebug/proto/BUILD
similarity index 68%
rename from src/main/java/com/google/devtools/build/lib/skylarkdebug/proto/BUILD
rename to src/main/java/com/google/devtools/build/lib/starlarkdebug/proto/BUILD
index 3f84639..d6b1306 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/proto/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdebug/proto/BUILD
@@ -1,10 +1,9 @@
load("@rules_java//java:defs.bzl", "java_proto_library")
-
-package(default_visibility = ["//src:__subpackages__"])
-
load("//tools/build_rules:utilities.bzl", "java_library_srcs")
load("@rules_proto//proto:defs.bzl", "proto_library")
+package(default_visibility = ["//src:__subpackages__"])
+
filegroup(
name = "srcs",
srcs = glob(["**"]),
@@ -13,15 +12,15 @@
java_library_srcs(
name = "dist_jars",
- deps = [":skylark_debugging_java_proto"],
+ deps = [":starlark_debugging_java_proto"],
)
java_proto_library(
- name = "skylark_debugging_java_proto",
- deps = ["skylark_debugging_proto"],
+ name = "starlark_debugging_java_proto",
+ deps = ["starlark_debugging_proto"],
)
proto_library(
- name = "skylark_debugging_proto",
- srcs = ["skylark_debugging.proto"],
+ name = "starlark_debugging_proto",
+ srcs = ["starlark_debugging.proto"],
)
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/proto/skylark_debugging.proto b/src/main/java/com/google/devtools/build/lib/starlarkdebug/proto/starlark_debugging.proto
similarity index 96%
rename from src/main/java/com/google/devtools/build/lib/skylarkdebug/proto/skylark_debugging.proto
rename to src/main/java/com/google/devtools/build/lib/starlarkdebug/proto/starlark_debugging.proto
index 13e6b76..b150e7f 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/proto/skylark_debugging.proto
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdebug/proto/starlark_debugging.proto
@@ -14,10 +14,10 @@
syntax = "proto3";
-package skylark_debugging;
+package starlark_debugging;
-option java_package = "com.google.devtools.build.lib.skylarkdebugging";
-option java_outer_classname = "SkylarkDebuggingProtos";
+option java_package = "com.google.devtools.build.lib.starlarkdebugging";
+option java_outer_classname = "StarlarkDebuggingProtos";
// A request sent by the debug client to the debug server.
message DebugRequest {
@@ -86,8 +86,7 @@
// A request to begin the debugging session. Starlark execution will block until
// this request is made, to allow initial setup after the connection is
// established (e.g. setting breakpoints).
-message StartDebuggingRequest {
-}
+message StartDebuggingRequest {}
// A request to pause execution of a thread, or all threads.
message PauseThreadRequest {
@@ -147,12 +146,10 @@
}
// The response to a SetBreakpointsRequest.
-message SetBreakpointsResponse {
-}
+message SetBreakpointsResponse {}
// The response to a ContinueExecutionRequest.
-message ContinueExecutionResponse {
-}
+message ContinueExecutionResponse {}
// The response to an EvaluateRequest.
message EvaluateResponse {
@@ -168,14 +165,12 @@
}
// The response to a StartDebuggingRequest.
-message StartDebuggingResponse {
-}
+message StartDebuggingResponse {}
// The response to a PauseThreadRequest. This is an acknowledgement that the
// request was received. Actual pausing of individual threads happens
// asynchronously, and will be communicated via ThreadPausedEvent(s).
-message PauseThreadResponse {
-}
+message PauseThreadResponse {}
// The response to a GetChildrenRequest.
message GetChildrenResponse {
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/BUILD b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/BUILD
similarity index 85%
rename from src/main/java/com/google/devtools/build/lib/skylarkdebug/server/BUILD
rename to src/main/java/com/google/devtools/build/lib/starlarkdebug/server/BUILD
index 0186927..770b213 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/BUILD
@@ -15,7 +15,7 @@
"//src/main/java/com/google/devtools/build/lib:syntax",
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
"//src/main/java/com/google/devtools/build/lib/events",
- "//src/main/java/com/google/devtools/build/lib/skylarkdebug/proto:skylark_debugging_java_proto",
+ "//src/main/java/com/google/devtools/build/lib/starlarkdebug/proto:starlark_debugging_java_proto",
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//third_party:guava",
"//third_party:jsr305",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/ConditionalBreakpointException.java b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/ConditionalBreakpointException.java
similarity index 93%
rename from src/main/java/com/google/devtools/build/lib/skylarkdebug/server/ConditionalBreakpointException.java
rename to src/main/java/com/google/devtools/build/lib/starlarkdebug/server/ConditionalBreakpointException.java
index df96ad9..ed793b5 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/ConditionalBreakpointException.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/ConditionalBreakpointException.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.build.lib.skylarkdebug.server;
+package com.google.devtools.build.lib.starlarkdebug.server;
/** An exception that occurs while evaluating a conditional breakpoint expression. */
final class ConditionalBreakpointException extends Exception {
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebugEventHelper.java b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebugEventHelper.java
similarity index 72%
rename from src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebugEventHelper.java
rename to src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebugEventHelper.java
index 61ecaaa..312b6de 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebugEventHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebugEventHelper.java
@@ -12,26 +12,26 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.build.lib.skylarkdebug.server;
+package com.google.devtools.build.lib.starlarkdebug.server;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.ContinueExecutionResponse;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.DebugEvent;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.Error;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.EvaluateResponse;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.Frame;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.GetChildrenResponse;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.ListFramesResponse;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.PauseThreadResponse;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.PausedThread;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.Scope;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.SetBreakpointsResponse;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.StartDebuggingResponse;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.ThreadContinuedEvent;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.ThreadPausedEvent;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.Value;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.ContinueExecutionResponse;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.DebugEvent;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.Error;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.EvaluateResponse;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.Frame;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.GetChildrenResponse;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.ListFramesResponse;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.PauseThreadResponse;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.PausedThread;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.Scope;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.SetBreakpointsResponse;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.StartDebuggingResponse;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.ThreadContinuedEvent;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.ThreadPausedEvent;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.Value;
import com.google.devtools.build.lib.syntax.Debug;
import com.google.devtools.build.lib.syntax.Location;
import com.google.devtools.build.lib.syntax.StarlarkFunction;
@@ -123,19 +123,19 @@
}
@Nullable
- static SkylarkDebuggingProtos.Location getLocationProto(@Nullable Location location) {
+ static StarlarkDebuggingProtos.Location getLocationProto(@Nullable Location location) {
if (location == null) {
return null;
}
- return SkylarkDebuggingProtos.Location.newBuilder()
+ return StarlarkDebuggingProtos.Location.newBuilder()
.setLineNumber(location.line())
.setColumnNumber(location.column())
.setPath(location.file())
.build();
}
- static SkylarkDebuggingProtos.Frame getFrameProto(ThreadObjectMap objectMap, Debug.Frame frame) {
- return SkylarkDebuggingProtos.Frame.newBuilder()
+ static StarlarkDebuggingProtos.Frame getFrameProto(ThreadObjectMap objectMap, Debug.Frame frame) {
+ return StarlarkDebuggingProtos.Frame.newBuilder()
.setFunctionName(frame.getFunction().getName())
.addAllScope(getScopes(objectMap, frame))
.setLocation(getLocationProto(frame.getLocation()))
@@ -161,16 +161,16 @@
getScope(objectMap, "local", localVars), getScope(objectMap, "global", globalVars));
}
- private static SkylarkDebuggingProtos.Scope getScope(
+ private static StarlarkDebuggingProtos.Scope getScope(
ThreadObjectMap objectMap, String name, Map<String, Object> bindings) {
- SkylarkDebuggingProtos.Scope.Builder builder =
- SkylarkDebuggingProtos.Scope.newBuilder().setName(name);
+ StarlarkDebuggingProtos.Scope.Builder builder =
+ StarlarkDebuggingProtos.Scope.newBuilder().setName(name);
bindings.forEach(
(s, o) -> builder.addBinding(DebuggerSerialization.getValueProto(objectMap, s, o)));
return builder.build();
}
- static StarlarkThread.Stepping convertSteppingEnum(SkylarkDebuggingProtos.Stepping stepping) {
+ static StarlarkThread.Stepping convertSteppingEnum(StarlarkDebuggingProtos.Stepping stepping) {
switch (stepping) {
case INTO:
return StarlarkThread.Stepping.INTO;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebugRequestException.java b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebugRequestException.java
similarity index 93%
rename from src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebugRequestException.java
rename to src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebugRequestException.java
index 092ac14..0901984 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebugRequestException.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebugRequestException.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.build.lib.skylarkdebug.server;
+package com.google.devtools.build.lib.starlarkdebug.server;
/**
* An exception that occurs while performing a debug request. Should be caught and communicated back
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebugServerTransport.java b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebugServerTransport.java
similarity index 94%
rename from src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebugServerTransport.java
rename to src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebugServerTransport.java
index e8c3852..3619eb1 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebugServerTransport.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebugServerTransport.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.build.lib.skylarkdebug.server;
+package com.google.devtools.build.lib.starlarkdebug.server;
import com.google.devtools.build.lib.events.Event;
import com.google.devtools.build.lib.events.EventHandler;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.DebugEvent;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.DebugRequest;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.DebugEvent;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.DebugRequest;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebuggerSerialization.java b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebuggerSerialization.java
similarity index 95%
rename from src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebuggerSerialization.java
rename to src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebuggerSerialization.java
index 22f371e..0a5d760 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebuggerSerialization.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebuggerSerialization.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.build.lib.skylarkdebug.server;
+package com.google.devtools.build.lib.starlarkdebug.server;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Ordering;
import com.google.devtools.build.lib.collect.nestedset.NestedSetView;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.Value;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.Value;
import com.google.devtools.build.lib.syntax.CallUtils;
import com.google.devtools.build.lib.syntax.ClassObject;
import com.google.devtools.build.lib.syntax.Depset;
@@ -31,7 +31,7 @@
import java.util.Map;
import java.util.Set;
-/** Helper class for creating {@link SkylarkDebuggingProtos.Value} from Starlark objects. */
+/** Helper class for creating {@link StarlarkDebuggingProtos.Value} from Starlark objects. */
final class DebuggerSerialization {
static Value getValueProto(ThreadObjectMap objectMap, String label, Object value) {
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/SkylarkDebugServer.java b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/StarlarkDebugServer.java
similarity index 83%
rename from src/main/java/com/google/devtools/build/lib/skylarkdebug/server/SkylarkDebugServer.java
rename to src/main/java/com/google/devtools/build/lib/starlarkdebug/server/StarlarkDebugServer.java
index dd088f0..bd3669e 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/SkylarkDebugServer.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/StarlarkDebugServer.java
@@ -12,14 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.build.lib.skylarkdebug.server;
-
+package com.google.devtools.build.lib.starlarkdebug.server;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Throwables;
import com.google.devtools.build.lib.events.Event;
import com.google.devtools.build.lib.events.EventHandler;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos;
import com.google.devtools.build.lib.syntax.Debugger;
import com.google.devtools.build.lib.syntax.Location;
import com.google.devtools.build.lib.syntax.StarlarkThread;
@@ -29,7 +28,7 @@
import javax.annotation.Nullable;
/** Manages the network socket and debugging state for threads running Starlark code. */
-public final class SkylarkDebugServer implements Debugger {
+public final class StarlarkDebugServer implements Debugger {
/**
* Initializes debugging support, setting up any debugging-specific overrides, then opens the
@@ -39,7 +38,7 @@
* @param verboseLogging if true, debug-level events will be logged
* @throws IOException if an I/O error occurs while opening the socket or waiting for a connection
*/
- public static SkylarkDebugServer createAndWaitForConnection(
+ public static StarlarkDebugServer createAndWaitForConnection(
EventHandler eventHandler, int port, boolean verboseLogging) throws IOException {
ServerSocket serverSocket = new ServerSocket(port, /* backlog */ 1);
return createAndWaitForConnection(eventHandler, serverSocket, verboseLogging);
@@ -53,12 +52,12 @@
* @throws IOException if an I/O error occurs while waiting for a connection
*/
@VisibleForTesting
- static SkylarkDebugServer createAndWaitForConnection(
+ static StarlarkDebugServer createAndWaitForConnection(
EventHandler eventHandler, ServerSocket serverSocket, boolean verboseLogging)
throws IOException {
DebugServerTransport transport =
DebugServerTransport.createAndWaitForClient(eventHandler, serverSocket, verboseLogging);
- return new SkylarkDebugServer(eventHandler, transport, verboseLogging);
+ return new StarlarkDebugServer(eventHandler, transport, verboseLogging);
}
private final EventHandler eventHandler;
@@ -69,7 +68,7 @@
private final boolean verboseLogging;
- private SkylarkDebugServer(
+ private StarlarkDebugServer(
EventHandler eventHandler, DebugServerTransport transport, boolean verboseLogging) {
this.eventHandler = eventHandler;
this.threadHandler = new ThreadHandler();
@@ -88,11 +87,11 @@
() -> {
try {
while (true) {
- SkylarkDebuggingProtos.DebugRequest request = transport.readClientRequest();
+ StarlarkDebuggingProtos.DebugRequest request = transport.readClientRequest();
if (request == null) {
return;
}
- SkylarkDebuggingProtos.DebugEvent response = handleClientRequest(request);
+ StarlarkDebuggingProtos.DebugEvent response = handleClientRequest(request);
if (response != null) {
transport.postEvent(response);
}
@@ -151,8 +150,8 @@
/** Handles a request from the client, and returns the response, where relevant. */
@Nullable
- private SkylarkDebuggingProtos.DebugEvent handleClientRequest(
- SkylarkDebuggingProtos.DebugRequest request) {
+ private StarlarkDebuggingProtos.DebugEvent handleClientRequest(
+ StarlarkDebuggingProtos.DebugRequest request) {
long sequenceNumber = request.getSequenceNumber();
try {
switch (request.getPayloadCase()) {
@@ -182,31 +181,31 @@
}
/** Handles a {@code ListFramesRequest} and returns its response. */
- private SkylarkDebuggingProtos.DebugEvent listFrames(
- long sequenceNumber, SkylarkDebuggingProtos.ListFramesRequest request)
+ private StarlarkDebuggingProtos.DebugEvent listFrames(
+ long sequenceNumber, StarlarkDebuggingProtos.ListFramesRequest request)
throws DebugRequestException {
- List<SkylarkDebuggingProtos.Frame> frames = threadHandler.listFrames(request.getThreadId());
+ List<StarlarkDebuggingProtos.Frame> frames = threadHandler.listFrames(request.getThreadId());
return DebugEventHelper.listFramesResponse(sequenceNumber, frames);
}
/** Handles a {@code SetBreakpointsRequest} and returns its response. */
- private SkylarkDebuggingProtos.DebugEvent setBreakpoints(
- long sequenceNumber, SkylarkDebuggingProtos.SetBreakpointsRequest request) {
+ private StarlarkDebuggingProtos.DebugEvent setBreakpoints(
+ long sequenceNumber, StarlarkDebuggingProtos.SetBreakpointsRequest request) {
threadHandler.setBreakpoints(request.getBreakpointList());
return DebugEventHelper.setBreakpointsResponse(sequenceNumber);
}
/** Handles a {@code EvaluateRequest} and returns its response. */
- private SkylarkDebuggingProtos.DebugEvent evaluate(
- long sequenceNumber, SkylarkDebuggingProtos.EvaluateRequest request)
+ private StarlarkDebuggingProtos.DebugEvent evaluate(
+ long sequenceNumber, StarlarkDebuggingProtos.EvaluateRequest request)
throws DebugRequestException {
return DebugEventHelper.evaluateResponse(
sequenceNumber, threadHandler.evaluate(request.getThreadId(), request.getStatement()));
}
/** Handles a {@code GetChildrenRequest} and returns its response. */
- private SkylarkDebuggingProtos.DebugEvent getChildren(
- long sequenceNumber, SkylarkDebuggingProtos.GetChildrenRequest request)
+ private StarlarkDebuggingProtos.DebugEvent getChildren(
+ long sequenceNumber, StarlarkDebuggingProtos.GetChildrenRequest request)
throws DebugRequestException {
return DebugEventHelper.getChildrenResponse(
sequenceNumber,
@@ -214,8 +213,8 @@
}
/** Handles a {@code ContinueExecutionRequest} and returns its response. */
- private SkylarkDebuggingProtos.DebugEvent continueExecution(
- long sequenceNumber, SkylarkDebuggingProtos.ContinueExecutionRequest request)
+ private StarlarkDebuggingProtos.DebugEvent continueExecution(
+ long sequenceNumber, StarlarkDebuggingProtos.ContinueExecutionRequest request)
throws DebugRequestException {
long threadId = request.getThreadId();
if (threadId == 0) {
@@ -226,8 +225,8 @@
return DebugEventHelper.continueExecutionResponse(sequenceNumber);
}
- private SkylarkDebuggingProtos.DebugEvent pauseThread(
- long sequenceNumber, SkylarkDebuggingProtos.PauseThreadRequest request)
+ private StarlarkDebuggingProtos.DebugEvent pauseThread(
+ long sequenceNumber, StarlarkDebuggingProtos.PauseThreadRequest request)
throws DebugRequestException {
long threadId = request.getThreadId();
if (threadId == 0) {
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/ThreadHandler.java b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/ThreadHandler.java
similarity index 88%
rename from src/main/java/com/google/devtools/build/lib/skylarkdebug/server/ThreadHandler.java
rename to src/main/java/com/google/devtools/build/lib/starlarkdebug/server/ThreadHandler.java
index db71b34..c487a4d 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/ThreadHandler.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/ThreadHandler.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.build.lib.skylarkdebug.server;
+package com.google.devtools.build.lib.starlarkdebug.server;
import static com.google.common.collect.ImmutableList.toImmutableList;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.Breakpoint;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.Error;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.PauseReason;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.Value;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.Breakpoint;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.Error;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.PauseReason;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.Value;
import com.google.devtools.build.lib.syntax.Debug;
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.syntax.EvalUtils;
@@ -99,7 +99,8 @@
private final Map<Long, SteppingThreadState> steppingThreads = new HashMap<>();
/** All location-based breakpoints (the only type of breakpoint currently supported). */
- private volatile ImmutableMap<SkylarkDebuggingProtos.Location, SkylarkDebuggingProtos.Breakpoint>
+ private volatile ImmutableMap<
+ StarlarkDebuggingProtos.Location, StarlarkDebuggingProtos.Breakpoint>
breakpoints = ImmutableMap.of();
/**
@@ -137,14 +138,14 @@
}
void setBreakpoints(Collection<Breakpoint> breakpoints) {
- Map<SkylarkDebuggingProtos.Location, SkylarkDebuggingProtos.Breakpoint> map = new HashMap<>();
- for (SkylarkDebuggingProtos.Breakpoint breakpoint : breakpoints) {
+ Map<StarlarkDebuggingProtos.Location, StarlarkDebuggingProtos.Breakpoint> map = new HashMap<>();
+ for (StarlarkDebuggingProtos.Breakpoint breakpoint : breakpoints) {
if (breakpoint.getConditionCase()
- != SkylarkDebuggingProtos.Breakpoint.ConditionCase.LOCATION) {
+ != StarlarkDebuggingProtos.Breakpoint.ConditionCase.LOCATION) {
continue;
}
// all breakpoints cover the entire line, so unset the column number
- SkylarkDebuggingProtos.Location location =
+ StarlarkDebuggingProtos.Location location =
breakpoint.getLocation().toBuilder().clearColumnNumber().build();
map.put(location, breakpoint);
}
@@ -161,7 +162,7 @@
synchronized (this) {
for (PausedThreadState thread : ImmutableList.copyOf(pausedThreads.values())) {
// continue-all doesn't support stepping.
- resumePausedThread(thread, SkylarkDebuggingProtos.Stepping.NONE);
+ resumePausedThread(thread, StarlarkDebuggingProtos.Stepping.NONE);
}
steppingThreads.clear();
}
@@ -172,7 +173,7 @@
* RUNNING. If the thread is not paused, but currently stepping, it clears the stepping behavior
* so it will run unconditionally.
*/
- void resumeThread(long threadId, SkylarkDebuggingProtos.Stepping stepping)
+ void resumeThread(long threadId, StarlarkDebuggingProtos.Stepping stepping)
throws DebugRequestException {
// once the user has requested any thread be resumed, don't continue pausing future threads
debuggerState = DebuggerState.RUNNING;
@@ -193,7 +194,7 @@
/** Unpauses a currently-paused thread. */
@GuardedBy("this")
private void resumePausedThread(
- PausedThreadState thread, SkylarkDebuggingProtos.Stepping stepping) {
+ PausedThreadState thread, StarlarkDebuggingProtos.Stepping stepping) {
pausedThreads.remove(thread.id);
StarlarkThread.ReadyToPause readyToPause =
thread.thread.stepControl(DebugEventHelper.convertSteppingEnum(stepping));
@@ -227,7 +228,7 @@
}
/** Handles a {@code ListFramesRequest} and returns its response. */
- ImmutableList<SkylarkDebuggingProtos.Frame> listFrames(long threadId)
+ ImmutableList<StarlarkDebuggingProtos.Frame> listFrames(long threadId)
throws DebugRequestException {
synchronized (this) {
PausedThreadState thread = pausedThreads.get(threadId);
@@ -260,7 +261,7 @@
return DebuggerSerialization.getChildren(objectMap, value);
}
- SkylarkDebuggingProtos.Value evaluate(long threadId, String statement)
+ StarlarkDebuggingProtos.Value evaluate(long threadId, String statement)
throws DebugRequestException {
StarlarkThread thread;
ThreadObjectMap objectMap;
@@ -322,7 +323,7 @@
synchronized (this) {
pausedThreads.put(threadId, pausedState);
}
- SkylarkDebuggingProtos.PausedThread threadProto =
+ StarlarkDebuggingProtos.PausedThread threadProto =
getPausedThreadProto(pausedState, pauseReason, conditionalBreakpointError);
transport.postEvent(DebugEventHelper.threadPausedEvent(threadProto));
pausedState.semaphore.acquireUninterruptibly();
@@ -365,17 +366,17 @@
private boolean hasBreakpointMatchedAtLocation(StarlarkThread thread, Location location)
throws ConditionalBreakpointException {
// breakpoints is volatile, so taking a local copy
- ImmutableMap<SkylarkDebuggingProtos.Location, SkylarkDebuggingProtos.Breakpoint> breakpoints =
+ ImmutableMap<StarlarkDebuggingProtos.Location, StarlarkDebuggingProtos.Breakpoint> breakpoints =
this.breakpoints;
if (breakpoints.isEmpty()) {
return false;
}
- SkylarkDebuggingProtos.Location locationProto = DebugEventHelper.getLocationProto(location);
+ StarlarkDebuggingProtos.Location locationProto = DebugEventHelper.getLocationProto(location);
if (locationProto == null) {
return false;
}
locationProto = locationProto.toBuilder().clearColumnNumber().build();
- SkylarkDebuggingProtos.Breakpoint breakpoint = breakpoints.get(locationProto);
+ StarlarkDebuggingProtos.Breakpoint breakpoint = breakpoints.get(locationProto);
if (breakpoint == null) {
return false;
}
@@ -391,12 +392,12 @@
}
/** Returns a {@code Thread} proto builder with information about the given thread. */
- private static SkylarkDebuggingProtos.PausedThread getPausedThreadProto(
+ private static StarlarkDebuggingProtos.PausedThread getPausedThreadProto(
PausedThreadState thread,
PauseReason pauseReason,
@Nullable Error conditionalBreakpointError) {
- SkylarkDebuggingProtos.PausedThread.Builder builder =
- SkylarkDebuggingProtos.PausedThread.newBuilder()
+ StarlarkDebuggingProtos.PausedThread.Builder builder =
+ StarlarkDebuggingProtos.PausedThread.newBuilder()
.setId(thread.id)
.setName(thread.name)
.setPauseReason(pauseReason)
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/ThreadObjectMap.java b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/ThreadObjectMap.java
similarity index 96%
rename from src/main/java/com/google/devtools/build/lib/skylarkdebug/server/ThreadObjectMap.java
rename to src/main/java/com/google/devtools/build/lib/starlarkdebug/server/ThreadObjectMap.java
index 4e55c61..9931eb4 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/ThreadObjectMap.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/ThreadObjectMap.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.build.lib.skylarkdebug.server;
+package com.google.devtools.build.lib.starlarkdebug.server;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index aad3ee2..4976b93 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -37,8 +37,8 @@
"//src/test/java/com/google/devtools/build/lib/skyframe/serialization:srcs",
"//src/test/java/com/google/devtools/build/lib/skyframe:srcs",
"//src/test/java/com/google/devtools/build/lib/skylark:srcs",
- "//src/test/java/com/google/devtools/build/lib/skylarkdebug/server:srcs",
"//src/test/java/com/google/devtools/build/lib/skylarkinterface/processor:srcs",
+ "//src/test/java/com/google/devtools/build/lib/starlarkdebug/server:srcs",
"//src/test/java/com/google/devtools/build/lib/supplier:srcs",
"//src/test/java/com/google/devtools/build/lib/syntax:srcs",
"//src/test/java/com/google/devtools/build/lib/versioning:srcs",
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkdebug/server/BUILD b/src/test/java/com/google/devtools/build/lib/starlarkdebug/server/BUILD
similarity index 67%
rename from src/test/java/com/google/devtools/build/lib/skylarkdebug/server/BUILD
rename to src/test/java/com/google/devtools/build/lib/starlarkdebug/server/BUILD
index 99ff86a..13233c1 100644
--- a/src/test/java/com/google/devtools/build/lib/skylarkdebug/server/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/starlarkdebug/server/BUILD
@@ -16,22 +16,22 @@
name = "utils",
srcs = ["MockDebugClient.java"],
deps = [
- "//src/main/java/com/google/devtools/build/lib/skylarkdebug/proto:skylark_debugging_java_proto",
+ "//src/main/java/com/google/devtools/build/lib/starlarkdebug/proto:starlark_debugging_java_proto",
"//third_party:guava",
"//third_party:jsr305",
],
)
java_test(
- name = "SkylarkDebugServerTest",
+ name = "StarlarkDebugServerTest",
size = "medium",
- srcs = ["SkylarkDebugServerTest.java"],
+ srcs = ["StarlarkDebugServerTest.java"],
deps = [
":utils",
"//src/main/java/com/google/devtools/build/lib:syntax",
"//src/main/java/com/google/devtools/build/lib/events",
- "//src/main/java/com/google/devtools/build/lib/skylarkdebug/proto:skylark_debugging_java_proto",
- "//src/main/java/com/google/devtools/build/lib/skylarkdebug/server",
+ "//src/main/java/com/google/devtools/build/lib/starlarkdebug/proto:starlark_debugging_java_proto",
+ "//src/main/java/com/google/devtools/build/lib/starlarkdebug/server",
"//src/test/java/com/google/devtools/build/lib/events:testutil",
"//third_party:guava",
"//third_party:junit4",
@@ -44,8 +44,8 @@
srcs = ["DebugServerTransportTest.java"],
deps = [
"//src/main/java/com/google/devtools/build/lib/events",
- "//src/main/java/com/google/devtools/build/lib/skylarkdebug/proto:skylark_debugging_java_proto",
- "//src/main/java/com/google/devtools/build/lib/skylarkdebug/server",
+ "//src/main/java/com/google/devtools/build/lib/starlarkdebug/proto:starlark_debugging_java_proto",
+ "//src/main/java/com/google/devtools/build/lib/starlarkdebug/server",
"//src/test/java/com/google/devtools/build/lib/events:testutil",
"//third_party:junit4",
"//third_party:truth",
@@ -58,9 +58,9 @@
deps = [
"//src/main/java/com/google/devtools/build/lib:syntax",
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
- "//src/main/java/com/google/devtools/build/lib/skylarkdebug/proto:skylark_debugging_java_proto",
- "//src/main/java/com/google/devtools/build/lib/skylarkdebug/server",
"//src/main/java/com/google/devtools/build/lib/skylarkinterface",
+ "//src/main/java/com/google/devtools/build/lib/starlarkdebug/proto:starlark_debugging_java_proto",
+ "//src/main/java/com/google/devtools/build/lib/starlarkdebug/server",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkdebug/server/DebugServerTransportTest.java b/src/test/java/com/google/devtools/build/lib/starlarkdebug/server/DebugServerTransportTest.java
similarity index 91%
rename from src/test/java/com/google/devtools/build/lib/skylarkdebug/server/DebugServerTransportTest.java
rename to src/test/java/com/google/devtools/build/lib/starlarkdebug/server/DebugServerTransportTest.java
index 330115d..a8cb472 100644
--- a/src/test/java/com/google/devtools/build/lib/skylarkdebug/server/DebugServerTransportTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlarkdebug/server/DebugServerTransportTest.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.build.lib.skylarkdebug.server;
+package com.google.devtools.build.lib.starlarkdebug.server;
import static com.google.common.truth.Truth.assertThat;
import com.google.devtools.build.lib.events.EventKind;
import com.google.devtools.build.lib.events.util.EventCollectionApparatus;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.ContinueExecutionResponse;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.DebugEvent;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.DebugRequest;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.StartDebuggingRequest;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.ContinueExecutionResponse;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.DebugEvent;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.DebugRequest;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.StartDebuggingRequest;
import java.io.IOException;
import java.net.BindException;
import java.net.InetAddress;
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkdebug/server/DebuggerSerializationTest.java b/src/test/java/com/google/devtools/build/lib/starlarkdebug/server/DebuggerSerializationTest.java
similarity index 98%
rename from src/test/java/com/google/devtools/build/lib/skylarkdebug/server/DebuggerSerializationTest.java
rename to src/test/java/com/google/devtools/build/lib/starlarkdebug/server/DebuggerSerializationTest.java
index a7c24f5..94151e3 100644
--- a/src/test/java/com/google/devtools/build/lib/skylarkdebug/server/DebuggerSerializationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlarkdebug/server/DebuggerSerializationTest.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.build.lib.skylarkdebug.server;
+package com.google.devtools.build.lib.starlarkdebug.server;
import static com.google.common.truth.Truth.assertThat;
@@ -22,8 +22,8 @@
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.collect.nestedset.NestedSetView;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.Value;
import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.Value;
import com.google.devtools.build.lib.syntax.Depset;
import com.google.devtools.build.lib.syntax.EvalUtils;
import com.google.devtools.build.lib.syntax.Printer;
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkdebug/server/MockDebugClient.java b/src/test/java/com/google/devtools/build/lib/starlarkdebug/server/MockDebugClient.java
similarity index 95%
rename from src/test/java/com/google/devtools/build/lib/skylarkdebug/server/MockDebugClient.java
rename to src/test/java/com/google/devtools/build/lib/starlarkdebug/server/MockDebugClient.java
index 409ab82..64974e7 100644
--- a/src/test/java/com/google/devtools/build/lib/skylarkdebug/server/MockDebugClient.java
+++ b/src/test/java/com/google/devtools/build/lib/starlarkdebug/server/MockDebugClient.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.build.lib.skylarkdebug.server;
+package com.google.devtools.build.lib.starlarkdebug.server;
import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.DebugEvent;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.DebugRequest;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.DebugEvent;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.DebugRequest;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkdebug/server/SkylarkDebugServerTest.java b/src/test/java/com/google/devtools/build/lib/starlarkdebug/server/StarlarkDebugServerTest.java
similarity index 91%
rename from src/test/java/com/google/devtools/build/lib/skylarkdebug/server/SkylarkDebugServerTest.java
rename to src/test/java/com/google/devtools/build/lib/starlarkdebug/server/StarlarkDebugServerTest.java
index 620aac8..22ad6c56 100644
--- a/src/test/java/com/google/devtools/build/lib/skylarkdebug/server/SkylarkDebugServerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlarkdebug/server/StarlarkDebugServerTest.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.build.lib.skylarkdebug.server;
+package com.google.devtools.build.lib.starlarkdebug.server;
import static com.google.common.truth.Truth.assertThat;
@@ -20,24 +20,24 @@
import com.google.common.collect.ImmutableList;
import com.google.devtools.build.lib.events.EventKind;
import com.google.devtools.build.lib.events.util.EventCollectionApparatus;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.Breakpoint;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.ContinueExecutionRequest;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.DebugEvent;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.DebugRequest;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.EvaluateRequest;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.Frame;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.ListFramesRequest;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.ListFramesResponse;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.Location;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.PauseReason;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.PausedThread;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.Scope;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.SetBreakpointsRequest;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.StartDebuggingRequest;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.StartDebuggingResponse;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.Stepping;
-import com.google.devtools.build.lib.skylarkdebugging.SkylarkDebuggingProtos.Value;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.Breakpoint;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.ContinueExecutionRequest;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.DebugEvent;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.DebugRequest;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.EvaluateRequest;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.Frame;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.ListFramesRequest;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.ListFramesResponse;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.Location;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.PauseReason;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.PausedThread;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.Scope;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.SetBreakpointsRequest;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.StartDebuggingRequest;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.StartDebuggingResponse;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.Stepping;
+import com.google.devtools.build.lib.starlarkdebugging.StarlarkDebuggingProtos.Value;
import com.google.devtools.build.lib.syntax.Debug;
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.syntax.EvalUtils;
@@ -66,9 +66,9 @@
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
-/** Integration tests for {@link SkylarkDebugServer}. */
+/** Integration tests for {@link StarlarkDebugServer}. */
@RunWith(JUnit4.class)
-public class SkylarkDebugServerTest {
+public class StarlarkDebugServerTest {
private final ExecutorService executor = Executors.newFixedThreadPool(2);
private final EventCollectionApparatus events =
@@ -76,7 +76,7 @@
private final ThreadObjectMap dummyObjectMap = new ThreadObjectMap();
private MockDebugClient client;
- private SkylarkDebugServer server;
+ private StarlarkDebugServer server;
/**
* Returns the {@link Value} proto message corresponding to the given object and label. Subsequent
@@ -108,10 +108,10 @@
@Before
public void setUpServerAndClient() throws Exception {
ServerSocket serverSocket = getServerSocket();
- Future<SkylarkDebugServer> future =
+ Future<StarlarkDebugServer> future =
executor.submit(
() ->
- SkylarkDebugServer.createAndWaitForConnection(
+ StarlarkDebugServer.createAndWaitForConnection(
events.reporter(), serverSocket, false));
client = new MockDebugClient();
client.connect(serverSocket, Duration.ofSeconds(10));
@@ -167,7 +167,7 @@
assertThat(event)
.isEqualTo(
DebugEventHelper.threadPausedEvent(
- SkylarkDebuggingProtos.PausedThread.newBuilder()
+ StarlarkDebuggingProtos.PausedThread.newBuilder()
.setId(threadId)
.setName(threadName)
.setPauseReason(PauseReason.INITIALIZING)
@@ -231,8 +231,8 @@
// wait for breakpoint to be hit
DebugEvent event = client.waitForEvent(DebugEvent::hasThreadPaused, Duration.ofSeconds(5));
- SkylarkDebuggingProtos.PausedThread expectedThreadState =
- SkylarkDebuggingProtos.PausedThread.newBuilder()
+ StarlarkDebuggingProtos.PausedThread expectedThreadState =
+ StarlarkDebuggingProtos.PausedThread.newBuilder()
.setName(threadName)
.setId(threadId)
.setPauseReason(PauseReason.HIT_BREAKPOINT)
@@ -270,7 +270,7 @@
assertThat(event)
.isEqualTo(
DebugEventHelper.threadPausedEvent(
- SkylarkDebuggingProtos.PausedThread.newBuilder()
+ StarlarkDebuggingProtos.PausedThread.newBuilder()
.setName(threadName)
.setId(threadId)
.setLocation(expectedBreakpoint.getLocation().toBuilder().setColumnNumber(1))
@@ -297,8 +297,8 @@
// wait for breakpoint to be hit
DebugEvent event = client.waitForEvent(DebugEvent::hasThreadPaused, Duration.ofSeconds(5));
- SkylarkDebuggingProtos.PausedThread expectedThreadState =
- SkylarkDebuggingProtos.PausedThread.newBuilder()
+ StarlarkDebuggingProtos.PausedThread expectedThreadState =
+ StarlarkDebuggingProtos.PausedThread.newBuilder()
.setName(threadName)
.setId(threadId)
.setPauseReason(PauseReason.HIT_BREAKPOINT)
@@ -327,14 +327,14 @@
// wait for breakpoint to be hit
DebugEvent event = client.waitForEvent(DebugEvent::hasThreadPaused, Duration.ofSeconds(5));
- SkylarkDebuggingProtos.PausedThread expectedThreadState =
- SkylarkDebuggingProtos.PausedThread.newBuilder()
+ StarlarkDebuggingProtos.PausedThread expectedThreadState =
+ StarlarkDebuggingProtos.PausedThread.newBuilder()
.setName(threadName)
.setId(threadId)
.setPauseReason(PauseReason.CONDITIONAL_BREAKPOINT_ERROR)
.setLocation(location.toBuilder().setColumnNumber(1))
.setConditionalBreakpointError(
- SkylarkDebuggingProtos.Error.newBuilder().setMessage("name \'z\' is not defined"))
+ StarlarkDebuggingProtos.Error.newBuilder().setMessage("name \'z\' is not defined"))
.build();
assertThat(event).isEqualTo(DebugEventHelper.threadPausedEvent(expectedThreadState));
@@ -641,7 +641,7 @@
// and verify the location and pause reason as well
Location expectedLocation = breakpoint.toBuilder().setLineNumber(2).setColumnNumber(3).build();
- SkylarkDebuggingProtos.PausedThread pausedThread = event.getThreadPaused().getThread();
+ StarlarkDebuggingProtos.PausedThread pausedThread = event.getThreadPaused().getThread();
assertThat(pausedThread.getPauseReason()).isEqualTo(PauseReason.STEPPING);
assertThat(pausedThread.getLocation()).isEqualTo(expectedLocation);
}
