fix:selection expansion in comments

[doofin]

solves #3615
only works with pure scala 3 project,doesn't seem to work with worksheet

There's redundancy in code but I'm not sure how to reduce it :

  val tkSrc = programStr.parse[Source].toOption.map(_.tokens)
    val tkExpr = programStr.parse[Stat].toOption.map(_.tokens)
    val tkType = programStr.parse[Type].toOption.map(_.tokens)

    val tokens = tkSrc orElse tkExpr orElse tkType

[tgodzik]

You should use something along the lines of:

val (treeStart, treeEnd) = path.headOption
      .map(t => (t.pos.start, t.pos.end))
      .getOrElse((0, text.size))
val offset = pos.start
val tokens = text.slice(treeStart, treeEnd)tokenize.toOption
      tokens
        .flatMap(t =>
          t.collectFirst {
            case t: Token.Comment
                if treeStart + t.pos.start < currentOffset &&
                  treeStart + t.pos.end >= currentOffset =>
              val range = new SelectionRange()
              range.setRange(t.pos.toLSP)
              Some(range)
          
            case _ =>
              Noene
          }
        )

[doofin]

Thanks for suggestion,but i'm not sure how to update offset to input ,which will cause error if it's not updated (used later in def toLsp: l.Range of extension (pos: SourcePosition)):

(commentList) // ++ merged)
        .filter((commentStart, commentEnd, _) =>
          commentStart <= cursorStartShifted && cursorStartShifted <= commentEnd
        )
        .map { (commentStart, commentEnd, oldPos) =>
          // todo! need to upg input if offset is nonzero!
          val newPos: Position =
            meta.Position.Range(
              oldPos.input,
              commentStart + offsetStart,
              commentEnd + offsetStart,
            )
          newPos
        }

[tgodzik]

Let's simplify it a bit and could you write some tests?

[tgodzik]

I don't think we should merge mutiple single line comments, that is usually not that for anything else.

[doofin]

removed this

[tgodzik]

Suggested change

	val commentList: List[(Int, Int, Position)] = tokenList.collect {
	case x: Comment =>
	println(
	s"find Comment \"${x}\" at ${(x.start, x.`end`)} " // :
	) // , ${(x.start, x.`end`, x.pos)}
	(x.start, x.`end`, x.pos)
	}
	val commentList: Option[lsp4j.Range] = tokenList.collectFirst {
	case x: Comment if cursorStartShifted && cursorStartShifted <= commentEnd =>
	SourcePosition(
	cursorStart.source,
	Spans.Span(
	commentStart + offsetStart,
	commentEnd + offsetStart,
	),
	).toLsp
	}

this should be enough and can be returned from the function.

[doofin]

Seems not quite so clear how to simplify this since some filter are complicated, but I have cleaned up a bit

[doofin]

Let's simplify it a bit and could you write some tests?

I write the test SelectionRangeCommentSuite but unable to run it due to lots of compile errors with testOnly tests.pc.SelectionRangeCommentSuite, maybe I run it with the wrong sbt command since this feature is only for Scala 3 ? The manual test is ok.

[tgodzik]

I took the liberty to change a couple of small things. Thanks for contributing!

[doofin]

Thanks ! very excited to my first contribution merged !