Code

Unify and clarify config loading#5636

Code

Closed

gibbz00 wants to merge 225 commits intohelix-editor:masterhelix-editor/helix:masterfrom gibbz00:unify-configgibbz00/helix:unify-configCopy head branch name to clipboard

+2,842-1,978

Commits

Commits on Aug 30, 2022

• docs: add section about local config, written like the one for languages

  AlexanderBrevig

  committed
  4e4873d

• fix: mistakes were made

  AlexanderBrevig

  committed
  1e9bee3

• fix: cleaner code

  AlexanderBrevig

  committed
  04da5ee

• fix: after rebase, reinstate editor.security

  AlexanderBrevig

  committed
  6ad3fb3

• fix: configuration book entry after rebase

  AlexanderBrevig

  committed
  a53a008

• fix: clippy from rebase

  AlexanderBrevig

  committed
  f93e2d1

Commits on Sep 1, 2022

• fix: use reduce and not fold

  AlexanderBrevig

  committed
  e6e6ec3

• fix: early exit

  AlexanderBrevig

  committed
  ed9aa60

• style: clippy ok

  AlexanderBrevig

  committed
  3da3606

Commits on Sep 9, 2022

• style: no need to else after early exit, golang style

  AlexanderBrevig

  committed
  9359c45

Commits on Sep 19, 2022

• fix: remove confirm_local_config

  

  Alexander Brevig

  committed
  a0f80cd

Commits on Sep 23, 2022

• fix: remove confirm option from book

  AlexanderBrevig

  committed
  11aa418

• style: merged an if statement

  AlexanderBrevig

  committed
  8acc1b9

Commits on Sep 24, 2022

• style: ...and early return

  AlexanderBrevig

  committed
  0f31164

Commits on Sep 26, 2022

• fix: default to loading configs

  AlexanderBrevig

  committed
  43470cc

Commits on Oct 9, 2022

• Make stickiness configurable

  bbodi

  committed
  671f297

Commits on Nov 18, 2022

• docs: fix typos

  AlexanderBrevig

  committed
  84b4f12

Commits on Dec 8, 2022

• Add support for labels in custom menu keymaps

  MattCheely

  committed
  09ea56b

• Add support for labels on typable commands

  MattCheely

  committed
  608687d

• refactor keymap map visitor to reduce # of cases

  MattCheely

  committed
  091b3f5

• Simplify labelled command pattern match

  Show description for 56d624e
  

  MattCheely

  and

  the-mikedavis

  committed
  56d624e

• Add some basic docs

  MattCheely

  committed
  3642213

• fix typos in menu label docs

  MattCheely

  committed
  7804572

• return errors for ambiguous and unsupported labels in menus

  MattCheely

  committed
  0e6c4af

Commits on Jan 18, 2023

• Generalised to multiple runtime directories with priorities

  Show description for 294d1a1
  

  paul-scott

  authored and

  Paul Scott

  committed
  294d1a1

• Removed AsRef usage to avoid binary growth

  

  paul-scott

  authored and

  Paul Scott

  committed
  b642e90

• Health displaying ;-separated runtime dirs

  

  Paul Scott

  committed
  c4620ff

• Changed HELIX_RUNTIME build from src instructions

  

  Paul Scott

  committed
  5a0a1db

Commits on Jan 22, 2023

• remove one-liner solely used for a test

  gibbz00

  committed
  6d50d7f

• Inline helper fuction of singular reference

  gibbz00

  committed
  37f49f6

• Remove order property of KeyTrie struct:

  Show description for c748f7c
  gibbz00

  committed
  c748f7c

• Infobox: Remove superflous command descripition pruning:

  Show description for 2c7c4d9
  gibbz00

  committed
  2c7c4d9

• Keymap infobox: Use Vec in place of BTree:

  Show description for 8d35e64
  gibbz00

  committed
  8d35e64

• Keymap infobox: Place in correct order from start:

  Show description for f187f2d
  gibbz00

  committed
  f187f2d

• Keymap infobox: Format body from start

  Show description for 2a0e9d2
  gibbz00

  committed
  2a0e9d2

• keymap.rs file splitting, cleanup and descriptive naming:

  Show description for faec827
  gibbz00

  committed
  faec827

• Rename MappableCommand field doc to description:

  Show description for d5520e8
  gibbz00

  committed
  d5520e8

• Initial sorting of keymap info window

  gibbz00

  committed
  aea10f7

• Infobox: Consistently place lowercase equivalents first

  Show description for 7f86d01
  gibbz00

  committed
  7f86d01

• Remove infobox optimization suggestion comment:

  Show description for 7935f77
  gibbz00

  committed
  7935f77

• keymap testing touchups

  gibbz00

  committed
  0482d09

• Exclude config no_op bindings in command palette.

  gibbz00

  committed
  6b01af5

• Cleaner infobox join operation

  gibbz00

  committed
  7a8397c

• use statement cleanups

  gibbz00

  committed
  546010b

• Move Config related tests from keymap tests Config tests

  gibbz00

  committed
  036ce4a

• Config test cleanup

  Show description for ac98d82
  gibbz00

  committed
  ac98d82

• Load keymap config consistently

  Show description for 109228b
  gibbz00

  committed
  109228b

• Make use of new self context in keymap config load

  gibbz00

  committed
  527198a

• Minor keymap module visibilyti cleanup

  gibbz00

  committed
  917ca0d

• Renamed the keymap! macro to keytrie!:

  Show description for 8b8fadb
  gibbz00

  committed
  8b8fadb

• Fix failed cherry picks

  gibbz00

  committed
  7747777

• Removed keymap::Keymap:

  Show description for 342f794
  gibbz00

  committed
  342f794

• Switched keymap::keymaps::Keymaps to keymap::Keymap

  Show description for 020c53a
  gibbz00

  committed
  020c53a

• Re-implemented pre-defined orders in keytrie

  Show description for bda06bc
  gibbz00

  committed
  bda06bc

• Add sort_infobox editor config option

  gibbz00

  committed
  87fc571

• Refine sorting behavior

  Show description for ecf5d61
  gibbz00

  committed
  ecf5d61

• Removed warnings

  gibbz00

  committed
  5e7f4a0

• Use .join(", ") rather that own implementation

  gibbz00

  committed
  c88a817

• Fix apply_trasaction rebase fail

  gibbz00

  committed
  2f0fa30

• Configuration -> LanguageConfigurations

  Show description for f3de1fb
  gibbz00

  committed
  f3de1fb

• user_lang_config -> merged_lang_config

  Show description for 55fb3e1
  gibbz00

  committed
  55fb3e1

• Enforce separation of concerns in config loading

  Show description for 34f4380
  gibbz00

  committed
  34f4380

• Move --help message to separate file.

  gibbz00

  committed
  e3ec215

• help.rs: use named parameters

  gibbz00

  committed
  cab5aac

• Fix error prone config setup in main

  Show description for 88bd9cc
  gibbz00

  committed
  88bd9cc

• Consistent exit handling

  Show description for 11248c1
  gibbz00

  committed
  11248c1

• Missed dual config setup in main.

  gibbz00

  committed
  3cd0042

• X Setup coherent config loading API

  Show description for 8c5700d
  gibbz00

  committed
  8c5700d

• Fix failing test

  gibbz00

  committed
  e6c49ad

• Merge remote-tracking branch 'myfork/keymap-presentation' into unify-config

  gibbz00

  committed
  1dfe855

• Fix failing test

  gibbz00

  committed
  3d52c7a

• Merge remote-tracking branch 'myfork/keymap-presentation' into unify-config

  gibbz00

  committed
  55a64f8

• Fix failing test

  gibbz00

  committed
  1eaaf2d

• lib.rs cleanup

  Show description for 6aec856
  gibbz00

  committed
  6aec856

• Unify tasks from xtask and helix_loader

  Show description for 5331bb6
  gibbz00

  committed
  5331bb6

• Use unified config loading in docgen and health

  Show description for 3be034c
  gibbz00

  committed
  3be034c

Commits on Jan 23, 2023

• Merge remote-tracking branch 'brevig-local-config/feat-load-local-config' into unify-config

  gibbz00

  committed
  b9b916d

• Touchoups

  Show description for d814356
  gibbz00

  committed
  d814356

• Run cargo fmt

  gibbz00

  committed
  ae6790c

• Use description conistenly

  gibbz00

  committed
  44ad646

• Accept +num flag for opening at line number

  nabaco

  committed
  eaea712

• Fix undeterministic test failure

  gibbz00

  committed
  abf2f28

• Merge remote-tracking branch 'myfork/keymap-presentation' into unify-config

  gibbz00

  committed
  bae26ae

• Implement clippy tips

  gibbz00

  committed
  eccda6e

• Merge remote-tracking branch 'myfork/keymap-presentation' into unify-config

  gibbz00

  committed
  64cefce

• Implement clippy tips

  gibbz00

  committed
  bcf3cb0

• Make cargo fmt happy

  gibbz00

  committed
  2afcfcf

• Merge remote-tracking branch 'myfork/keymap-presentation' into unify-config

  gibbz00

  committed
  b8affcc

Commits on Jan 24, 2023

• Make updated cargo clippy happy

  gibbz00

  committed
  c617fd1

• Merge remote-tracking branch 'myfork/keymap-presentation' into unify-config

  gibbz00

  committed
  3cac825

• Merge branch 'master' into keymap-presentation

  gibbz00

  authored
  7dbacf3

• Unblock helix-editor#5656

  gibbz00

  committed
  4d02459

• Merge remote-tracking branch 'myfork/keymap-presentation' into unify-config

  gibbz00

  committed
  e3dd261

• Fight with cargo fmt round 3

  gibbz00

  committed
  b4b82b4

• Merge branch 'keymap-presentation' of https://github.com/gibbz00/helix into keymap-presentation

  gibbz00

  committed
  8c1333a

• Merge remote-tracking branch 'myfork/keymap-presentation' into unify-config

  gibbz00

  committed
  58a9cad

• Run cargo fmt

  gibbz00

  committed
  3f760f1

• Merge helix-editor#5411

  Show description for 90926bb
  gibbz00

  committed
  90926bb

• make fmt and clippy happy

  gibbz00

  committed
  2d463f1

• Use PathBuf::from("rel_path") rather than pathbuf::new().join("rel_path")

  gibbz00

  committed
  f2afd72

• Inline load_toml() introduced in helix-editor#5411

  gibbz00

  committed
  1f966d7

• Theme.rs

  Show description for 0b9c2e8
  gibbz00

  committed
  0b9c2e8

• Create helix_loader::get_first_runtime_dir

  Show description for e7aee35
  gibbz00

  committed
  e7aee35

Commits on Jan 25, 2023

• remove one-liner solely used for a test

  gibbz00

  committed
  c8dd563

• Inline helper fuction of singular reference

  gibbz00

  committed
  df49f60

• Remove order property of KeyTrie struct:

  Show description for 69ed135
  gibbz00

  committed
  69ed135

• Infobox: Remove superflous command descripition pruning:

  Show description for 10151a9
  gibbz00

  committed
  10151a9

• Keymap infobox: Use Vec in place of BTree:

  Show description for 465c0ef
  gibbz00

  committed
  465c0ef

• Keymap infobox: Place in correct order from start:

  Show description for 8768bf9
  gibbz00

  committed
  8768bf9

• Keymap infobox: Format body from start

  Show description for b50050b
  gibbz00

  committed
  b50050b

• keymap.rs file splitting, cleanup and descriptive naming:

  Show description for eb50de1
  gibbz00

  committed
  eb50de1

• Rename MappableCommand field doc to description:

  Show description for d74be02
  gibbz00

  committed
  d74be02

• Initial sorting of keymap info window

  gibbz00

  committed
  7192a4e

• Infobox: Consistently place lowercase equivalents first

  Show description for 26adc32
  gibbz00

  committed
  26adc32

• Remove infobox optimization suggestion comment:

  Show description for 4fb58f7
  gibbz00

  committed
  4fb58f7

• keymap testing touchups

  gibbz00

  committed
  d33ff8b

• Exclude config no_op bindings in command palette.

  gibbz00

  committed
  958e8bc

• Cleaner infobox join operation

  gibbz00

  committed
  d0f93ec

• use statement cleanups

  gibbz00

  committed
  876885e

• Move Config related tests from keymap tests Config tests

  gibbz00

  committed
  315fa89

• Config test cleanup

  Show description for fcf8e6b
  gibbz00

  committed
  fcf8e6b

• Load keymap config consistently

  Show description for e233a1b
  gibbz00

  committed
  e233a1b

• Make use of new self context in keymap config load

  gibbz00

  committed
  4a188d2

• Minor keymap module visibilyti cleanup

  gibbz00

  committed
  baf8640

• Renamed the keymap! macro to keytrie!:

  Show description for 3466209
  gibbz00

  committed
  3466209

• Fix failed cherry picks

  gibbz00

  committed
  ff25380

• Removed keymap::Keymap:

  Show description for 5c6c0ed
  gibbz00

  committed
  5c6c0ed

• Switched keymap::keymaps::Keymaps to keymap::Keymap

  Show description for ff6b53f
  gibbz00

  committed
  ff6b53f

• Re-implemented pre-defined orders in keytrie

  Show description for aed2e90
  gibbz00

  committed
  aed2e90

• Add sort_infobox editor config option

  gibbz00

  committed
  5edce2e

• Refine sorting behavior

  Show description for 0b08e38
  gibbz00

  committed
  0b08e38

• Removed warnings

  gibbz00

  committed
  5049e7c

• Use .join(", ") rather that own implementation

  gibbz00

  committed
  4f758ee

• Fix apply_trasaction rebase fail

  gibbz00

  committed
  c224bf3

• Fix failing test

  gibbz00

  committed
  95a2b87

• Run cargo fmt

  gibbz00

  committed
  941624b

• Use description conistenly

  gibbz00

  committed
  7735b34

• Fix undeterministic test failure

  gibbz00

  committed
  8e1a3da

• Implement clippy tips

  gibbz00

  committed
  16e2d74

• Make cargo fmt happy

  gibbz00

  committed
  dc8e463

• Make updated cargo clippy happy

  gibbz00

  committed
  4bfa470

• Fight with cargo fmt round 3

  gibbz00

  committed
  03088b2

• Attempt race condition fix for RUNTIME dirs.

  gibbz00

  committed
  4bf9f82

• Merge branch 'keymap-presentation' of https://github.com/gibbz00/helix into keymap-presentation

  gibbz00

  committed
  eaf883b

• Merge remote-tracking branch 'origin/master' into unify-config

  gibbz00

  committed
  89936e1

• Grammar fetch/build into OS data directory

  gibbz00

  committed
  816a9dd

• Proper runtime directory health diagnostics

  Show description for eb31bd7
  gibbz00

  committed
  eb31bd7

• Merge remote-tracking branch 'origin/master' into keymap-presentation

  gibbz00

  committed
  fa615c2

• Merge remote-tracking branch 'origin' into keymap-presentation

  gibbz00

  committed
  4af3d1d

• merge escaped keymap test

  gibbz00

  committed
  13a9f3e

• Merge branch 'keymap-presentation' into unify-config

  gibbz00

  committed
  b27f4a5

• cargo fmt

  gibbz00

  committed
  c5e505e

• Initial alternative solution to helix-editor#5203

  gibbz00

  committed
  8dd2169

• Scrapped FromIterator<InfoboxRow> idea

  Show description for b8e1ee4
  gibbz00

  committed
  b8e1ee4

• Infobox: Typaple commands w/ arguments formatting

  gibbz00

  committed
  375238f

Commits on Jan 26, 2023

• health: add formatter binary

  Show description for dc06713
  jzelinskie

  committed
  dc06713

Commits on Feb 12, 2023

• Add prefix position to file args

  Show description for 1e6c605
  bheylin

  committed
  1e6c605

• Fix clippies

  bheylin

  committed
  0a75108

• Fix typos

  bheylin

  committed
  461e31f

• Fix typos

  bheylin

  committed
  22e491e

Commits on Feb 13, 2023

• Fix integration tests and split parse tests into fns

  bheylin

  committed
  872f01f

• Rm assert_matches dep

  bheylin

  committed
  0622cdc

• Rm file indexing in tests

  bheylin

  committed
  34ab790

• Rephrase PathBug instances in tests

  bheylin

  committed
  e480a16

• Merge 'matt-cheely/labels-for-config-menus'

  Show description for 8d4626c
  gibbz00

  committed
  8d4626c

• Merge branch 'master' of https://github.com/helix-editor/helix into keymap-presentation

  gibbz00

  committed
  a7abb1f

• Merge with master and keymap-refactoring

  gibbz00

  committed
  395bfa6

• fix clippy warnigs

  gibbz00

  committed
  b06eb3f

• Merge branch 'keymap-presentation' into unify-config

  gibbz00

  committed
  0756dd5

Commits on Feb 14, 2023

• fix cargo doc warnings

  gibbz00

  committed
  56189c9

• Sorted infobox: place A- before C- bindings

  gibbz00

  committed
  f44a348

• keyboard.rs: remove reduntant comments

  gibbz00

  committed
  b62d9a4

• Merge 'jzelinskie/formatter-health' w/ unify-config

  gibbz00

  committed
  9825ca0

• merge 'nabaco/plus-goto-argument' & unify-config

  gibbz00

  committed
  044e344

• Merge 'bheylin/add-cli-file-pos-prefix'

  gibbz00

  committed
  fcbae4b

• args.rs: remove reduntant comments

  gibbz00

  committed
  b69a7d4

• args.rs: move PositionRequest for file readability

  Show description for 2665ae8
  gibbz00

  committed
  2665ae8

• load-local-config set to false by default

  Show description for 7b5b268
  gibbz00

  committed
  7b5b268

Commits on Feb 15, 2023

• Merge 'bbodi/sticky-config/sticky-config'

  Show description for b609a02
  gibbz00

  committed
  b609a02

• Merge branch 'keymap-presentation' into unify-config

  gibbz00

  committed
  c36ba42

• Sticky can now overwrite pre-defined sticky.

  gibbz00

  committed
  72e1581

• cargo fmt

  gibbz00

  committed
  ad9bc2a

• Clarify sticky in remapping.md

  gibbz00

  committed
  34db341

• Add tests for user defined sticky

  gibbz00

  committed
  2d9cea8

• config.rs: clean up tests

  gibbz00

  committed
  68c66ac

• fix keytrie on default mappable command override bug

  Show description for 6a81215
  gibbz00

  committed
  6a81215

• keytrie.rs: merge_keytrie() refactor

  gibbz00

  committed
  91d8d92

• replace custom join with vec::join

  gibbz00

  committed
  159150b

• revert some cleanup of use statements

  Show description for 683931a
  gibbz00

  committed
  683931a

• Merge with 'keymap-presentation'

  gibbz00

  committed
  ec76a96

• improve keymap deserialize error handlig

  Show description for e98afd2
  gibbz00

  committed
  e98afd2

• Merge branch 'keymap-presentation'

  gibbz00

  committed
  3a06115

• fix refresh theme bug:

  Show description for 27c45ba
  gibbz00

  committed
  27c45ba

• clippy lints

  gibbz00

  committed
  f3d102e

• unify theme loading pt. 1

  Show description for fcd8b31
  gibbz00

  committed
  fcd8b31

• unify theme loading pt. 2

  Show description for 9bcd089
  gibbz00

  committed
  9bcd089

• unify theme loading pt. 3

  Show description for 9de7893
  gibbz00

  committed
  9de7893

• unify theme loading pt. 4

  Show description for 737b856
  gibbz00

  committed
  737b856

• application.rs: Inline refresh_lang_config.

  gibbz00

  committed
  ba7520b

• Remove lang_configs_loader field from Appliction

  Show description for 692d744
  gibbz00

  committed
  692d744

• Unwrap in terminal.size()

  Show description for 4ba73b3
  gibbz00

  committed
  4ba73b3

• Tweak usage of lang_configs_loader

  gibbz00

  committed
  cf9fd51

• Unify true_color detection

  Show description for ebe7ddf
  gibbz00

  committed
  ebe7ddf

• unify theme color support checking

  gibbz00

  committed
  05d04f3

• Unify theme loading

  Show description for 1055cd2
  gibbz00

  committed
  1055cd2

Commits on Feb 16, 2023

• Theme::read_names API cleanup

  Show description for dc1fa33
  gibbz00

  committed
  dc1fa33

• Place Impl blocks under stuct declarations

  Show description for 6fde0e1
  gibbz00

  committed
  6fde0e1

• Theme::new/update(theme_name: String -> &str)

  gibbz00

  committed
  6335989

• Inline field definition in Editor::new

  gibbz00

  committed
  95b227a

• Unify logging

  Show description for d1135f7
  gibbz00

  committed
  d1135f7

• Rename editor::Config to EditorConfig

  Show description for 40a4e3d
  gibbz00

  committed
  40a4e3d

• add Theme::default

  Show description for 9a2257b
  gibbz00

  committed
  9a2257b

• make true color support bool a static

  Show description for eceb19f
  gibbz00

  committed
  eceb19f

• Merge Theme::update and new

  gibbz00

  committed
  08a1038

• main.rs: generalize config load error prompt

  gibbz00

  committed
  73136a9

• main.rs: cleanup true color support setup

  gibbz00

  committed
  134e8bf

• Remove Option wrapper for Config.theme

  Show description for 1678741
  gibbz00

  committed
  1678741

• Theme::default impl comment

  gibbz00

  committed
  64eaf09

• main.rs: inline theme and lang config load checks

  gibbz00

  committed
  28b60a9

• remove unused function Tree:area()

  gibbz00

  committed
  b4076e5

• fix clippy lints

  gibbz00

  committed
  d326827

Commits on Feb 17, 2023

• custom description refinements

  Show description for a0d918a
  gibbz00

  committed
  a0d918a

• Merge 'keymap-presentation' into unify-config

  gibbz00

  committed
  5ef96da

• Merge 'origin/master' into unify-config

  gibbz00

  committed
  95a7d26

• fix load default theme on startup if user fails

  gibbz00

  committed
  31dc585