Skip to content

Commit a73265a

Browse files
ConradIrwinConradIrwin
committed
Merge branch 'main' into command_palette2
2 parents 77d92ff + cb8c534 commit a73265a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+9170
-2342
lines changed

‎Cargo.lock‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/settings/default.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,16 @@
102102
"selections": true
103103
},
104104
"relative_line_numbers": false,
105+
// When to populate a new search's query based on the text under the cursor.
106+
// This setting can take the following three values:
107+
//
108+
// 1. Always populate the search query with the word under the cursor (default).
109+
// "always"
110+
// 2. Only populate the search query when there is text selected
111+
// "selection"
112+
// 3. Never populate the search query
113+
// "never"
114+
"seed_search_query_from_cursor": "always",
105115
// Inlay hint related settings
106116
"inlay_hints": {
107117
// Global switch to toggle hints on and off, switched off by default.

‎assets/themes/src/vscode/gruvbox/gruvbox-dark-hard.json‎

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,10 @@
423423
}
424424
},
425425
{
426-
"scope": ["string.interpolated.dollar.shell", "string.interpolated.backtick.shell"],
426+
"scope": [
427+
"string.interpolated.dollar.shell",
428+
"string.interpolated.backtick.shell"
429+
],
427430
"settings": {
428431
"foreground": "#8ec07c"
429432
}
@@ -489,13 +492,19 @@
489492

490493
{
491494
"name": "coloring of the Java import and package identifiers",
492-
"scope": ["storage.modifier.import.java", "storage.modifier.package.java"],
495+
"scope": [
496+
"storage.modifier.import.java",
497+
"storage.modifier.package.java"
498+
],
493499
"settings": {
494500
"foreground": "#bdae93"
495501
}
496502
},
497503
{
498-
"scope": ["keyword.other.import.java", "keyword.other.package.java"],
504+
"scope": [
505+
"keyword.other.import.java",
506+
"keyword.other.package.java"
507+
],
499508
"settings": {
500509
"foreground": "#8ec07c"
501510
}
@@ -628,7 +637,9 @@
628637
},
629638
{
630639
"name": "JSON Level 0",
631-
"scope": ["source.json meta.structure.dictionary.json support.type.property-name.json"],
640+
"scope": [
641+
"source.json meta.structure.dictionary.json support.type.property-name.json"
642+
],
632643
"settings": {
633644
"foreground": "#b8bb26"
634645
}
@@ -761,7 +772,10 @@
761772
}
762773
},
763774
{
764-
"scope": ["source.go keyword.interface", "source.go keyword.struct"],
775+
"scope": [
776+
"source.go keyword.interface",
777+
"source.go keyword.struct"
778+
],
765779
"settings": {
766780
"foreground": "#83a598"
767781
}
@@ -788,7 +802,10 @@
788802

789803
{
790804
"name": "ReasonML String",
791-
"scope": ["source.reason string.double", "source.reason string.regexp"],
805+
"scope": [
806+
"source.reason string.double",
807+
"source.reason string.regexp"
808+
],
792809
"settings": {
793810
"foreground": "#b8bb26"
794811
}
@@ -809,7 +826,10 @@
809826
},
810827
{
811828
"name": "ReasonML property",
812-
"scope": ["source.reason support.property-value", "source.reason entity.name.filename"],
829+
"scope": [
830+
"source.reason support.property-value",
831+
"source.reason entity.name.filename"
832+
],
813833
"settings": {
814834
"foreground": "#fe8019"
815835
}
@@ -831,7 +851,9 @@
831851
},
832852
{
833853
"name": "Powershell function attribute",
834-
"scope": ["source.powershell support.function.attribute.powershell"],
854+
"scope": [
855+
"source.powershell support.function.attribute.powershell"
856+
],
835857
"settings": {
836858
"foreground": "#bdae93"
837859
}

‎assets/themes/src/vscode/gruvbox/gruvbox-dark-medium.json‎

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,10 @@
423423
}
424424
},
425425
{
426-
"scope": ["string.interpolated.dollar.shell", "string.interpolated.backtick.shell"],
426+
"scope": [
427+
"string.interpolated.dollar.shell",
428+
"string.interpolated.backtick.shell"
429+
],
427430
"settings": {
428431
"foreground": "#8ec07c"
429432
}
@@ -489,13 +492,19 @@
489492

490493
{
491494
"name": "coloring of the Java import and package identifiers",
492-
"scope": ["storage.modifier.import.java", "storage.modifier.package.java"],
495+
"scope": [
496+
"storage.modifier.import.java",
497+
"storage.modifier.package.java"
498+
],
493499
"settings": {
494500
"foreground": "#bdae93"
495501
}
496502
},
497503
{
498-
"scope": ["keyword.other.import.java", "keyword.other.package.java"],
504+
"scope": [
505+
"keyword.other.import.java",
506+
"keyword.other.package.java"
507+
],
499508
"settings": {
500509
"foreground": "#8ec07c"
501510
}
@@ -628,7 +637,9 @@
628637
},
629638
{
630639
"name": "JSON Level 0",
631-
"scope": ["source.json meta.structure.dictionary.json support.type.property-name.json"],
640+
"scope": [
641+
"source.json meta.structure.dictionary.json support.type.property-name.json"
642+
],
632643
"settings": {
633644
"foreground": "#b8bb26"
634645
}
@@ -761,7 +772,10 @@
761772
}
762773
},
763774
{
764-
"scope": ["source.go keyword.interface", "source.go keyword.struct"],
775+
"scope": [
776+
"source.go keyword.interface",
777+
"source.go keyword.struct"
778+
],
765779
"settings": {
766780
"foreground": "#83a598"
767781
}
@@ -788,7 +802,10 @@
788802

789803
{
790804
"name": "ReasonML String",
791-
"scope": ["source.reason string.double", "source.reason string.regexp"],
805+
"scope": [
806+
"source.reason string.double",
807+
"source.reason string.regexp"
808+
],
792809
"settings": {
793810
"foreground": "#b8bb26"
794811
}
@@ -809,7 +826,10 @@
809826
},
810827
{
811828
"name": "ReasonML property",
812-
"scope": ["source.reason support.property-value", "source.reason entity.name.filename"],
829+
"scope": [
830+
"source.reason support.property-value",
831+
"source.reason entity.name.filename"
832+
],
813833
"settings": {
814834
"foreground": "#fe8019"
815835
}
@@ -831,7 +851,9 @@
831851
},
832852
{
833853
"name": "Powershell function attribute",
834-
"scope": ["source.powershell support.function.attribute.powershell"],
854+
"scope": [
855+
"source.powershell support.function.attribute.powershell"
856+
],
835857
"settings": {
836858
"foreground": "#bdae93"
837859
}

‎assets/themes/src/vscode/gruvbox/gruvbox-dark-soft.json‎

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,10 @@
423423
}
424424
},
425425
{
426-
"scope": ["string.interpolated.dollar.shell", "string.interpolated.backtick.shell"],
426+
"scope": [
427+
"string.interpolated.dollar.shell",
428+
"string.interpolated.backtick.shell"
429+
],
427430
"settings": {
428431
"foreground": "#8ec07c"
429432
}
@@ -489,13 +492,19 @@
489492

490493
{
491494
"name": "coloring of the Java import and package identifiers",
492-
"scope": ["storage.modifier.import.java", "storage.modifier.package.java"],
495+
"scope": [
496+
"storage.modifier.import.java",
497+
"storage.modifier.package.java"
498+
],
493499
"settings": {
494500
"foreground": "#bdae93"
495501
}
496502
},
497503
{
498-
"scope": ["keyword.other.import.java", "keyword.other.package.java"],
504+
"scope": [
505+
"keyword.other.import.java",
506+
"keyword.other.package.java"
507+
],
499508
"settings": {
500509
"foreground": "#8ec07c"
501510
}
@@ -628,7 +637,9 @@
628637
},
629638
{
630639
"name": "JSON Level 0",
631-
"scope": ["source.json meta.structure.dictionary.json support.type.property-name.json"],
640+
"scope": [
641+
"source.json meta.structure.dictionary.json support.type.property-name.json"
642+
],
632643
"settings": {
633644
"foreground": "#b8bb26"
634645
}
@@ -761,7 +772,10 @@
761772
}
762773
},
763774
{
764-
"scope": ["source.go keyword.interface", "source.go keyword.struct"],
775+
"scope": [
776+
"source.go keyword.interface",
777+
"source.go keyword.struct"
778+
],
765779
"settings": {
766780
"foreground": "#83a598"
767781
}
@@ -788,7 +802,10 @@
788802

789803
{
790804
"name": "ReasonML String",
791-
"scope": ["source.reason string.double", "source.reason string.regexp"],
805+
"scope": [
806+
"source.reason string.double",
807+
"source.reason string.regexp"
808+
],
792809
"settings": {
793810
"foreground": "#b8bb26"
794811
}
@@ -809,7 +826,10 @@
809826
},
810827
{
811828
"name": "ReasonML property",
812-
"scope": ["source.reason support.property-value", "source.reason entity.name.filename"],
829+
"scope": [
830+
"source.reason support.property-value",
831+
"source.reason entity.name.filename"
832+
],
813833
"settings": {
814834
"foreground": "#fe8019"
815835
}
@@ -831,7 +851,9 @@
831851
},
832852
{
833853
"name": "Powershell function attribute",
834-
"scope": ["source.powershell support.function.attribute.powershell"],
854+
"scope": [
855+
"source.powershell support.function.attribute.powershell"
856+
],
835857
"settings": {
836858
"foreground": "#bdae93"
837859
}

0 commit comments

Comments
 (0)