Skip to content

Commit 4d3a104

Browse files
committed
Rename dependencies to projectDependencies
1 parent 5c6651f commit 4d3a104

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class DottyLanguageServer extends LanguageServer
134134
val allProjects = drivers.keySet
135135

136136
def transitiveDependencies(config: ProjectConfig): Set[ProjectConfig] = {
137-
val dependencies = config.dependencies.map(idToConfig).toSet
137+
val dependencies = config.projectDependencies.map(idToConfig).toSet
138138
dependencies ++ dependencies.flatMap(transitiveDependencies)
139139
}
140140

language-server/src/dotty/tools/languageserver/config/ProjectConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class ProjectConfig {
1111
public final File[] sourceDirectories;
1212
public final File[] dependencyClasspath;
1313
public final File classDirectory;
14-
public final String[] dependencies;
14+
public final String[] projectDependencies;
1515

1616
@JsonCreator
1717
public ProjectConfig(
@@ -21,13 +21,13 @@ public ProjectConfig(
2121
@JsonProperty("sourceDirectories") File[] sourceDirectories,
2222
@JsonProperty("dependencyClasspath") File[] dependencyClasspath,
2323
@JsonProperty("classDirectory") File classDirectory,
24-
@JsonProperty("dependencies") String[] dependencies) {
24+
@JsonProperty("projectDependencies") String[] projectDependencies) {
2525
this.id = id;
2626
this.compilerVersion = compilerVersion;
2727
this.compilerArguments = compilerArguments;
2828
this.sourceDirectories = sourceDirectories;
2929
this.dependencyClasspath = dependencyClasspath;
3030
this.classDirectory = classDirectory;
31-
this.dependencies = dependencies;
31+
this.projectDependencies = projectDependencies;
3232
}
3333
}

language-server/test/dotty/tools/languageserver/util/server/TestServer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class TestServer(testFolder: Path, projects: List[Project]) {
6060
| "sourceDirectories" : ${showSeq(sourceDirectory(project, wipe = false) :: Nil)},
6161
| "dependencyClasspath" : ${showSeq(dependencyClasspath(project))},
6262
| "classDirectory" : "${classDirectory(project, wipe = false).toString.replace('\\','/')}",
63-
| "dependencies": ${showSeq(project.dependsOn.map(_.name))}
63+
| "projectDependencies": ${showSeq(project.dependsOn.map(_.name))}
6464
|}
6565
|""".stripMargin
6666
}

0 commit comments

Comments
 (0)