Code

WIP: Scala 3#170

Code

Draft

Kazark wants to merge 45 commits intohvesalai:masterhvesalai/emacs-scala-mode:masterfrom

Kazark:scala3Kazark/emacs-scala-mode:scala3Copy head branch name to clipboard

Commits

Commits on Apr 13, 2021

• Read the code and fiddle toward Scala 3 a bit

  

  Keith Pinson

  committed
  ce97702

  Copy full SHA for ce97702

• Begin to match `scala-mode-syntax` against the 3.0 BNF

  

  Keith Pinson

  committed
  eef2bff

  Copy full SHA for eef2bff

• Octal numerals are no longer supported in Scala

  Show description for 7d190ef
  

  Keith Pinson

  committed
  7d190ef

  Copy full SHA for 7d190ef

• Continue to match `scala-mode-syntax` against the 3.0 BNF

  

  Keith Pinson

  committed
  d22aed2

  Copy full SHA for d22aed2

Commits on May 5, 2021

• Continue to match `scala-mode-syntax` against the 3.0 BNF (2)

  

  Keith Pinson

  committed
  18a27ce

  Copy full SHA for 18a27ce

Commits on Jun 17, 2021

• Beginning to see just how vastly daunting this change is

  

  Keith Pinson

  committed
  265e69a

  Copy full SHA for 265e69a

Commits on Jun 23, 2021

• Realized that whitespace syntax centers around block, not body

  

  Keith Pinson

  committed
  5e73968

  Copy full SHA for 5e73968

• Still trying to figure out my way around

  

  Keith Pinson

  committed
  cfeef68

  Copy full SHA for cfeef68

Commits on Jun 24, 2021

• Some crude but meaningful progress on indentation

  

  Keith Pinson

  committed
  225081e

  Copy full SHA for 225081e

Commits on Jun 25, 2021

• Small and imprecise progress on indentation

  

  Keith Pinson

  committed
  7dad271

  Copy full SHA for 7dad271

Commits on Jul 22, 2021

• finish going through the lexical syntax, and some

  

  Keith Pinson

  committed
  cd11904

  Copy full SHA for cd11904

• I am not going to make progress just by tweaking

  Show description for 1fa19e6
  

  Keith Pinson

  committed
  1fa19e6

  Copy full SHA for 1fa19e6

• Really go nuclear on the existing indenting algorithms

  

  Keith Pinson

  committed
  1859e83

  Copy full SHA for 1859e83

Commits on Oct 4, 2021

• baby steps on a new approach

  

  Keith Pinson

  committed
  c11cbbd

  Copy full SHA for c11cbbd

• primitive support for object blocks with whitespace

  

  Keith Pinson

  committed
  738b88e

  Copy full SHA for 738b88e

• support enum and more flexible object blocks

  

  Keith Pinson

  committed
  b00f933

  Copy full SHA for b00f933

• initial support for indentation-based match-case expressions

  

  Keith Pinson

  committed
  80d75fc

  Copy full SHA for 80d75fc

• fix misbehavior on whitespace around `case`

  

  Keith Pinson

  committed
  06494c3

  Copy full SHA for 06494c3

• support many more syntactic scenarios

  

  Keith Pinson

  committed
  ac22bd6

  Copy full SHA for ac22bd6

• initial support for for-comprehensions, which are problematic

  

  Keith Pinson

  committed
  8218464

  Copy full SHA for 8218464

• initial support for dot-chaining, which is problematic

  Show description for 8eb91cd
  

  Keith Pinson

  committed
  8eb91cd

  Copy full SHA for 8eb91cd

• get for-comps working tolerably, and a bit of work on dot chaining

  

  Keith Pinson

  committed
  0e77db6

  Copy full SHA for 0e77db6

Commits on Oct 5, 2021

• get if-then-else working

  

  Keith Pinson

  committed
  0f3e7ea

  Copy full SHA for 0f3e7ea

• role back dedented; if-then-else edgecases; &c

  

  Keith Pinson

  committed
  c5b0f46

  Copy full SHA for c5b0f46

• hey, this is starting to work pretty well

  

  Keith Pinson

  committed
  11d5c11

  Copy full SHA for 11d5c11

Commits on Dec 23, 2021

• Get dot-chaining much more stable; but other things unstable

  

  Keith Pinson

  committed
  f2a0fbd

  Copy full SHA for f2a0fbd

• Run both indentation algorithms; choose result by simple heuristic

  Show description for b7ea24a
  

  Keith Pinson

  committed
  b7ea24a

  Copy full SHA for b7ea24a

• Still trying to get dot-chaining perfected

  Show description for 442203e
  

  Keith Pinson

  committed
  442203e

  Copy full SHA for 442203e

Commits on Dec 30, 2021

• Detect infinite loop and break

  

  Keith Pinson

  committed
  d26a1d2

  Copy full SHA for d26a1d2

• Seems to fix the infinite loop

  

  Keith Pinson

  committed
  a6983a5

  Copy full SHA for a6983a5

• Extract function: `scala-indent:continue-lookback?`

  

  Keith Pinson

  committed
  c8a7bba

  Copy full SHA for c8a7bba

Commits on Jan 4, 2022

• Augh, try to fix a bunch of cases without breaking others

  Show description for 1ef3ce5
  

  Keith Pinson

  committed
  1ef3ce5

  Copy full SHA for 1ef3ce5

Commits on Jan 5, 2022

• WIP: Adding cycling indent

  Show description for c18f2bb
  

  Jack Viers

  authored and

  Jack Viers

  committed
  c18f2bb

  Copy full SHA for c18f2bb

Commits on May 16, 2022

• Cycles between current indent and 0 when cycle-indent is true

  jackcviers

  committed
  74eaa24

  Copy full SHA for 74eaa24

Commits on May 18, 2022

• Merge pull request #1 from jackcviers/scala3-indent-cycle

  Show description for 35f265f
  Kazark

  authored
  35f265f

  Copy full SHA for 35f265f

Commits on May 19, 2022

• Fixes incorrect argument order in call-interactively

  Show description for 9d77eec
  jackcviers

  committed
  9d77eec

  Copy full SHA for 9d77eec

• Merge pull request #2 from jackcviers/scala3-indent-cycle

  Show description for e22ef62
  Kazark

  authored
  e22ef62

  Copy full SHA for e22ef62

Commits on Jun 5, 2023

• fix typo in function name

  maemre

  committed
  ad122e4

  Copy full SHA for ad122e4

• indent after declarations

  maemre

  committed
  56d1f77

  Copy full SHA for 56d1f77

• do not push nil into the analysis stack

  maemre

  committed
  5323a09

  Copy full SHA for 5323a09

• disable aggressive paren rule temporarily

  maemre

  committed
  9df2ba4

  Copy full SHA for 9df2ba4

• preliminary indentation support for `extension`

  maemre

  committed
  be4ef5c

  Copy full SHA for be4ef5c

• add support for `do` as an align keyword like `then` and `else`.

  Show description for 417dd61
  maemre

  committed
  417dd61

  Copy full SHA for 417dd61

• Preserve line numbers for blank lines.

  Show description for 5eef13b
  maemre

  committed
  5eef13b

  Copy full SHA for 5eef13b

Commits on Jul 6, 2023

• Merge pull request #7 from maemre/scala3

  Show description for 238d4ea
  Kazark

  authored
  238d4ea

  Copy full SHA for 238d4ea