Skip to content

Fix comments and indentation #8161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 1, 2020
Merged

Fix comments and indentation #8161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6ee476
Fix comments
nicolasstucki Jan 31, 2020
d376905
Fix indentation
nicolasstucki Jan 31, 2020
cab18d0
Fix docs indentation
nicolasstucki Jan 31, 2020
864aae5
Homogenize section commnet tags
nicolasstucki Jan 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 74 additions & 57 deletions compiler/src/dotty/tools/dotc/tastyreflect/ReflectionCompilerInterface.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,21 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
def rootPosition: util.SourcePosition =
tastyreflect.MacroExpansion.position.getOrElse(SourcePosition(rootContext.source, Spans.NoSpan))

//
// QUOTE UNPICKLING
//

//////////////////////
// QUOTE UNPICKLING //
//////////////////////

def unpickleExpr(repr: Unpickler.PickledQuote, args: Unpickler.PickledExprArgs): scala.quoted.Expr[?] =
new TastyTreeExpr(PickledQuotes.unpickleExpr(repr, args), compilerId)

def unpickleType(repr: Unpickler.PickledQuote, args: Unpickler.PickledTypeArgs): scala.quoted.Type[?] =
new TreeType(PickledQuotes.unpickleType(repr, args), compilerId)

//
// CONTEXT
//

/////////////
// CONTEXT //
/////////////

type Context = core.Contexts.Context

Expand All @@ -64,9 +66,10 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
def Context_requiredModule(self: Context)(path: String): Symbol = self.requiredModule(path)
def Context_requiredMethod(self: Context)(path: String): Symbol = self.requiredMethod(path)

//
// REPORTING
//

///////////////
// REPORTING //
///////////////

def error(msg: => String, pos: Position)(given ctx: Context): Unit =
ctx.error(msg, pos)
Expand All @@ -80,17 +83,19 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
def warning(msg: => String, sourceFile: SourceFile, start: Int, end: Int)(given ctx: Context): Unit =
ctx.error(msg, util.SourcePosition(sourceFile, util.Spans.Span(start, end)))

//
// Settings
//

//////////////
// Settings //
//////////////

type Settings = config.ScalaSettings

def Settings_color(self: Settings): Boolean = self.color.value(rootContext) == "always"

//
// TREES
//

///////////
// TREES //
///////////

type Tree = tpd.Tree

Expand Down Expand Up @@ -1094,9 +1099,10 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
def Tree_Alternatives_module_copy(original: Tree)(patterns: List[Tree])(given Context): Alternatives =
tpd.cpy.Alternative(original)(patterns)

//
// TYPES
//

/////////////
// TYPES //
/////////////

type TypeOrBounds = Types.Type

Expand Down Expand Up @@ -1479,9 +1485,10 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
self.newParamRef(idx)
def TypeLambda_resType(self: TypeLambda)(given Context): Type = self.resType

//
// IMPORT SELECTORS
//

//////////////////////
// IMPORT SELECTORS //
//////////////////////

type ImportSelector = untpd.ImportSelector

Expand Down Expand Up @@ -1527,19 +1534,21 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
def SimpleSelector_omitted(self: OmitSelector)(given Context): Id =
self.imported

//
// IDENTIFIERS
//

/////////////////
// IDENTIFIERS //
/////////////////

type Id = untpd.Ident

def Id_pos(self: Id)(given Context): Position = self.sourcePos

def Id_name(self: Id)(given Context): String = self.name.toString

//
// SIGNATURES
//

////////////////
// SIGNATURES //
////////////////

type Signature = core.Signature

Expand All @@ -1554,9 +1563,10 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
def Signature_resultSig(self: Signature): String =
self.resSig.toString

//
// POSITIONS
//

///////////////
// POSITIONS //
///////////////

type Position = util.SourcePosition

Expand All @@ -1579,29 +1589,32 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
def Position_sourceCode(self: Position): String =
new String(self.source.content(), self.start, self.end - self.start)

//
// SOURCE FILES
//

//////////////////
// SOURCE FILES //
//////////////////

type SourceFile = util.SourceFile

def SourceFile_jpath(self: SourceFile): java.nio.file.Path = self.file.jpath

def SourceFile_content(self: SourceFile): String = new String(self.content())

//
// COMMENTS
//

//////////////
// COMMENTS //
//////////////

type Comment = core.Comments.Comment

def Comment_raw(self: Comment): String = self.raw
def Comment_expanded(self: Comment): Option[String] = self.expanded
def Comment_usecases(self: Comment): List[(String, Option[DefDef])] = self.usecases.map { uc => (uc.code, uc.tpdCode) }

//
// CONSTANTS
//

///////////////
// CONSTANTS //
///////////////

type Constant = Constants.Constant

Expand All @@ -1618,9 +1631,10 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend

def Constant_ClassTag_apply(x: Type): Constant = Constants.Constant(x)

//
// SYMBOLS
//

/////////////
// SYMBOLS //
/////////////

type Symbol = core.Symbols.Symbol

Expand Down Expand Up @@ -1768,9 +1782,10 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend

def Symbol_noSymbol(given ctx: Context): Symbol = core.Symbols.NoSymbol

//
// FLAGS
//

///////////
// FLAGS //
///////////

type Flags = core.Flags.FlagSet

Expand Down Expand Up @@ -1820,9 +1835,10 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
def Flags_PrivateLocal: Flags = core.Flags.PrivateLocal
def Flags_Package: Flags = core.Flags.Package

//
// QUOTED SEAL/UNSEAL
//

////////////////////////
// QUOTED SEAL/UNSEAL //
////////////////////////

/** View this expression `quoted.Expr[?]` as a `Term` */
def QuotedExpr_unseal(self: scala.quoted.Expr[?])(given Context): Term =
Expand Down Expand Up @@ -1858,9 +1874,9 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
new TreeType(tpd.TypeTree(self).withSpan(dummySpan), compilerId)
}

//
// DEFINITIONS
//
/////////////////
// DEFINITIONS //
/////////////////

// Symbols

Expand Down Expand Up @@ -1937,9 +1953,10 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
def Definitions_NullType: Type = defn.NullType
def Definitions_StringType: Type = defn.StringType

//
// IMPLICITS
//

///////////////
// IMPLICITS //
///////////////

type ImplicitSearchResult = Tree

Expand Down Expand Up @@ -2033,9 +2050,9 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
seq(argVals, rec(fn))
}

//
// HELPERS
//
/////////////
// HELPERS //
/////////////

private def optional[T <: Trees.Tree[?]](tree: T): Option[tree.type] =
if (tree.isEmpty) None else Some(tree)
Expand Down
Loading