mirror of https://github.com/sbt/sbt.git
fix typo
This commit is contained in:
parent
52d36653da
commit
0d0cd2eabf
|
|
@ -105,7 +105,7 @@ $ make
|
||||||
|
|
||||||
In addition, you have to git clone https://github.com/brendangregg/FlameGraph
|
In addition, you have to git clone https://github.com/brendangregg/FlameGraph
|
||||||
|
|
||||||
In a fresh termimal, run sbt with `-XX:+PreserveFramePointer` flag:
|
In a fresh terminal, run sbt with `-XX:+PreserveFramePointer` flag:
|
||||||
|
|
||||||
```
|
```
|
||||||
$ sbt -J-Dsbt.launcher.standby=20s -J-XX:+PreserveFramePointer exit
|
$ sbt -J-Dsbt.launcher.standby=20s -J-XX:+PreserveFramePointer exit
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ package xsbti;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An Action is very miminal representation of a `CodeAction` in the LSP protocol.
|
* An Action is very minimal representation of a `CodeAction` in the LSP protocol.
|
||||||
*
|
*
|
||||||
* <p>However it only focuses on the actual title, description, and edit, leaving it up to the
|
* <p>However it only focuses on the actual title, description, and edit, leaving it up to the
|
||||||
* language server to communicate with the client and put together a proper codeAction in accordance
|
* language server to communicate with the client and put together a proper codeAction in accordance
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ trait JValueFormats { self: sjsonnew.BasicJsonProtocol =>
|
||||||
given JValueJsonReader: JR[JValue] = new JR[JValue] {
|
given JValueJsonReader: JR[JValue] = new JR[JValue] {
|
||||||
def read[J](j: Option[J], u: Unbuilder[J]) = j match {
|
def read[J](j: Option[J], u: Unbuilder[J]) = j match {
|
||||||
case Some(x: JValue) => x
|
case Some(x: JValue) => x
|
||||||
case Some(x) => sys.error(s"Uknown AST $x")
|
case Some(x) => sys.error(s"Unknown AST $x")
|
||||||
case _ => JNull
|
case _ => JNull
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ goto endInit
|
||||||
|
|
||||||
:Win9xArg
|
:Win9xArg
|
||||||
@REM Slurp the command line arguments. This loop allows for an unlimited number
|
@REM Slurp the command line arguments. This loop allows for an unlimited number
|
||||||
@REM of agruments (up to the command line limit, anyway).
|
@REM of arguments (up to the command line limit, anyway).
|
||||||
set CMD_LINE_ARGS=
|
set CMD_LINE_ARGS=
|
||||||
:Win9xApp
|
:Win9xApp
|
||||||
if %1a==a goto endInit
|
if %1a==a goto endInit
|
||||||
|
|
|
||||||
|
|
@ -407,7 +407,7 @@ final class IvySbt(
|
||||||
e.uri.map(Hash.contentsIfLocal).getOrElse(Array.empty)
|
e.uri.map(Hash.contentsIfLocal).getOrElse(Array.empty)
|
||||||
)
|
)
|
||||||
|
|
||||||
// Redefine to use a subset of properties, that are serialisable
|
// Redefine to use a subset of properties, that are serializable
|
||||||
override given InlineIvyConfigurationFormat: JsonFormat[InlineIvyConfiguration] = {
|
override given InlineIvyConfigurationFormat: JsonFormat[InlineIvyConfiguration] = {
|
||||||
def hlToInlineIvy(i: InlineIvyHL): InlineIvyConfiguration = {
|
def hlToInlineIvy(i: InlineIvyHL): InlineIvyConfiguration = {
|
||||||
val (
|
val (
|
||||||
|
|
@ -429,7 +429,7 @@ final class IvySbt(
|
||||||
projectFormat[InlineIvyConfiguration, InlineIvyHL](inlineIvyToHL, hlToInlineIvy)
|
projectFormat[InlineIvyConfiguration, InlineIvyHL](inlineIvyToHL, hlToInlineIvy)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Redefine to use a subset of properties, that are serialisable
|
// Redefine to use a subset of properties, that are serializable
|
||||||
override given ExternalIvyConfigurationFormat: JsonFormat[ExternalIvyConfiguration] = {
|
override given ExternalIvyConfigurationFormat: JsonFormat[ExternalIvyConfiguration] = {
|
||||||
def hlToExternalIvy(e: ExternalIvyHL): ExternalIvyConfiguration = {
|
def hlToExternalIvy(e: ExternalIvyHL): ExternalIvyConfiguration = {
|
||||||
val (baseDirectory, _) = e
|
val (baseDirectory, _) = e
|
||||||
|
|
|
||||||
|
|
@ -752,8 +752,8 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Merges ModuleReports, which represents orgnization, name, and version.
|
* Merges ModuleReports, which represents organization, name, and version.
|
||||||
* Returns a touple of (surviving modules ++ non-conflicting modules, newly evicted modules).
|
* Returns a tuple of (surviving modules ++ non-conflicting modules, newly evicted modules).
|
||||||
*/
|
*/
|
||||||
def mergeModuleReports(
|
def mergeModuleReports(
|
||||||
rootModuleConf: ConfigRef,
|
rootModuleConf: ConfigRef,
|
||||||
|
|
@ -845,7 +845,7 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine {
|
||||||
* Conflict resolution could be expensive, so this is first cached to `cachedResolutionResolveCache` if the conflict is between 2 modules.
|
* Conflict resolution could be expensive, so this is first cached to `cachedResolutionResolveCache` if the conflict is between 2 modules.
|
||||||
* Otherwise, the default "latest" resolution takes the following precedence:
|
* Otherwise, the default "latest" resolution takes the following precedence:
|
||||||
* 1. overrides passed in to `os`.
|
* 1. overrides passed in to `os`.
|
||||||
* 2. diretly forced dependency within the artificial module.
|
* 2. directly forced dependency within the artificial module.
|
||||||
* 3. latest revision.
|
* 3. latest revision.
|
||||||
* Note transitively forced dependencies are not respected. This seems to be the case for stock Ivy's behavior as well,
|
* Note transitively forced dependencies are not respected. This seems to be the case for stock Ivy's behavior as well,
|
||||||
* which may be because Ivy makes all Maven dependencies as forced="true".
|
* which may be because Ivy makes all Maven dependencies as forced="true".
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ import org.apache.ivy.util.extendable.ExtendableItem
|
||||||
* This class contains all the logic for dealing with the extra attributes in pom files relating to extra attributes
|
* This class contains all the logic for dealing with the extra attributes in pom files relating to extra attributes
|
||||||
* on dependency declarations.
|
* on dependency declarations.
|
||||||
*
|
*
|
||||||
* Specifically, if we have a dependency on an sbt plugin, there are two properties that need to propogate:
|
* Specifically, if we have a dependency on an sbt plugin, there are two properties that need to propagate:
|
||||||
* - `sbtVersion`
|
* - `sbtVersion`
|
||||||
* - `scalaVersion`
|
* - `scalaVersion`
|
||||||
*
|
*
|
||||||
|
|
@ -48,7 +48,7 @@ object PomExtraDependencyAttributes {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mutates the to collection with the extra depdendency attributes from the incoming pom properties list.
|
* Mutates the to collection with the extra dependency attributes from the incoming pom properties list.
|
||||||
*
|
*
|
||||||
* @param from The properties directly off a maven POM file
|
* @param from The properties directly off a maven POM file
|
||||||
* @param to The aaether properties where we can write whatever we want.
|
* @param to The aaether properties where we can write whatever we want.
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ import verify.BasicTestSuite
|
||||||
|
|
||||||
// TODO - We need to re-enable this test. Right now, we dont' have a "stub" launcher for this.
|
// TODO - We need to re-enable this test. Right now, we dont' have a "stub" launcher for this.
|
||||||
// This is testing something which uses a launcher interface, but was grabbing the underlying class directly
|
// This is testing something which uses a launcher interface, but was grabbing the underlying class directly
|
||||||
// when it really should, instead, be stubbing out the underyling class.
|
// when it really should, instead, be stubbing out the underlying class.
|
||||||
|
|
||||||
object ComponentManagerTest extends BasicTestSuite {
|
object ComponentManagerTest extends BasicTestSuite {
|
||||||
val TestID = "manager-test"
|
val TestID = "manager-test"
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ package sbt.internal.bsp
|
||||||
* The server communicates during the initialize handshake whether this method is supported or not.
|
* The server communicates during the initialize handshake whether this method is supported or not.
|
||||||
* An empty run request is valid.
|
* An empty run request is valid.
|
||||||
* @param target The build target to run.
|
* @param target The build target to run.
|
||||||
* @param originId An option identifier gnerated by the client to identify this request.
|
* @param originId An option identifier generated by the client to identify this request.
|
||||||
The server may include this id in triggered notifications or responses.
|
The server may include this id in triggered notifications or responses.
|
||||||
* @param arguments Optional arguments to the executed application.
|
* @param arguments Optional arguments to the executed application.
|
||||||
* @param dataKind Kind of data to expect in the data field.
|
* @param dataKind Kind of data to expect in the data field.
|
||||||
|
|
|
||||||
|
|
@ -590,7 +590,7 @@ type RunParams {
|
||||||
## The build target to run.
|
## The build target to run.
|
||||||
target: sbt.internal.bsp.BuildTargetIdentifier!
|
target: sbt.internal.bsp.BuildTargetIdentifier!
|
||||||
|
|
||||||
## An option identifier gnerated by the client to identify this request.
|
## An option identifier generated by the client to identify this request.
|
||||||
## The server may include this id in triggered notifications or responses.
|
## The server may include this id in triggered notifications or responses.
|
||||||
originId: String
|
originId: String
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue