f804ed3 · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

Make shebangs optional, they don't make sense outside of scripts

f804ed3Blaž Hrastnik5 years ago

helix-core/src/syntax.rs+2−1

compare with master

unifiedsplit

@@ -52,7 +52,8 @@ pub struct LanguageConfiguration {

52 pub language_id: String,

53 pub scope: String, // source.rust

54 pub file_types: Vec<String>, // filename ends_with? <Gemfile, rb, etc>

55+ #[serde(default)]

55− pub shebangs: Vec<String>, // interpreter(s) associated with language

56+ pub shebangs: Vec<String>, // interpreter(s) associated with language

56 pub roots: Vec<String>, // these indicate project roots <.git, Cargo.toml>

57 pub roots: Vec<String>, // these indicate project roots <.git, Cargo.toml>

57 pub comment_token: Option<String>,

58 pub comment_token: Option<String>,

languages.toml+3−25

@@ -3,7 +3,6 @@ name = "rust"

3scope = "source.rust"

4injection-regex = "rust"

5file-types = ["rs"]

6−shebangs = []

7roots = []

6roots = []

8auto-format = true

7auto-format = true

9comment-token = "//"

8comment-token = "//"

@@ -18,7 +17,6 @@ name = "toml"

18scope = "source.toml"

17scope = "source.toml"

19injection-regex = "toml"

18injection-regex = "toml"

20file-types = ["toml"]

19file-types = ["toml"]

21−shebangs = []

22roots = []

20roots = []

23comment-token = "#"

21comment-token = "#"

@@ -29,7 +27,6 @@ name = "protobuf"

29scope = "source.proto"

27scope = "source.proto"

30injection-regex = "protobuf"

28injection-regex = "protobuf"

31file-types = ["proto"]

29file-types = ["proto"]

32−shebangs = []

33roots = []

30roots = []

34comment-token = "//"

31comment-token = "//"

@@ -40,7 +37,7 @@ name = "elixir"

40scope = "source.elixir"

37scope = "source.elixir"

41injection-regex = "elixir"

38injection-regex = "elixir"

42file-types = ["ex", "exs"]

39file-types = ["ex", "exs"]

43−shebangs = []

40+shebangs = ["elixir"]

44roots = []

41roots = []

45comment-token = "#"

42comment-token = "#"

@@ -64,7 +61,6 @@ name = "json"

64scope = "source.json"

61scope = "source.json"

65injection-regex = "json"

62injection-regex = "json"

66file-types = ["json"]

63file-types = ["json"]

67−shebangs = []

68roots = []

64roots = []

70indent = { tab-width = 2, unit = " " }

66indent = { tab-width = 2, unit = " " }

@@ -74,7 +70,6 @@ name = "c"

74scope = "source.c"

70scope = "source.c"

75injection-regex = "c"

71injection-regex = "c"

76file-types = ["c"] # TODO: ["h"]

72file-types = ["c"] # TODO: ["h"]

77−shebangs = []

78roots = []

73roots = []

79comment-token = "//"

74comment-token = "//"

@@ -86,7 +81,6 @@ name = "cpp"

86scope = "source.cpp"

81scope = "source.cpp"

87injection-regex = "cpp"

82injection-regex = "cpp"

88file-types = ["cc", "hh", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino"]

83file-types = ["cc", "hh", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino"]

89−shebangs = []

90roots = []

84roots = []

91comment-token = "//"

85comment-token = "//"

@@ -98,7 +92,6 @@ name = "c-sharp"

98scope = "source.csharp"

92scope = "source.csharp"

99injection-regex = "c-?sharp"

93injection-regex = "c-?sharp"

100file-types = ["cs"]

94file-types = ["cs"]

101−shebangs = []

102roots = []

95roots = []

103comment-token = "//"

96comment-token = "//"

104

@@ -109,7 +102,6 @@ name = "go"

109scope = "source.go"

102scope = "source.go"

110injection-regex = "go"

103injection-regex = "go"

111file-types = ["go"]

104file-types = ["go"]

112−shebangs = []

113roots = ["Gopkg.toml", "go.mod"]

105roots = ["Gopkg.toml", "go.mod"]

114auto-format = true

106auto-format = true

115comment-token = "//"

107comment-token = "//"

@@ -123,7 +115,7 @@ name = "javascript"

123scope = "source.js"

115scope = "source.js"

124injection-regex = "^(js|javascript)$"

116injection-regex = "^(js|javascript)$"

125file-types = ["js", "mjs"]

117file-types = ["js", "mjs"]

126−shebangs = []

118+shebangs = ["node"]

127roots = []

119roots = []

128comment-token = "//"

120comment-token = "//"

129# TODO: highlights-jsx, highlights-params

121# TODO: highlights-jsx, highlights-params

@@ -147,7 +139,6 @@ name = "tsx"

147scope = "source.tsx"

139scope = "source.tsx"

148injection-regex = "^(tsx)$" # |typescript

140injection-regex = "^(tsx)$" # |typescript

149file-types = ["tsx"]

141file-types = ["tsx"]

150−shebangs = []

151roots = []

142roots = []

152# TODO: highlights-jsx, highlights-params

143# TODO: highlights-jsx, highlights-params

153

144

@@ -159,7 +150,6 @@ name = "css"

159scope = "source.css"

150scope = "source.css"

160injection-regex = "css"

151injection-regex = "css"

161file-types = ["css"]

152file-types = ["css"]

162−shebangs = []

163roots = []

153roots = []

164

154

165indent = { tab-width = 2, unit = " " }

155indent = { tab-width = 2, unit = " " }

@@ -169,7 +159,6 @@ name = "html"

169scope = "text.html.basic"

159scope = "text.html.basic"

170injection-regex = "html"

160injection-regex = "html"

171file-types = ["html"]

161file-types = ["html"]

172−shebangs = []

173roots = []

162roots = []

174

163

175indent = { tab-width = 2, unit = " " }

164indent = { tab-width = 2, unit = " " }

@@ -238,7 +227,6 @@ name = "latex"

238scope = "source.tex"

227scope = "source.tex"

239injection-regex = "tex"

228injection-regex = "tex"

240file-types = ["tex"]

229file-types = ["tex"]

241−shebangs = []

242roots = []

230roots = []

243comment-token = "%"

231comment-token = "%"

244

232

@@ -249,7 +237,6 @@ name = "julia"

249scope = "source.julia"

237scope = "source.julia"

250injection-regex = "julia"

238injection-regex = "julia"

251file-types = ["jl"]

239file-types = ["jl"]

252−shebangs = []

253roots = []

240roots = []

254comment-token = "#"

241comment-token = "#"

255language-server = { command = "julia", args = [

242language-server = { command = "julia", args = [

@@ -275,7 +262,6 @@ name = "java"

275scope = "source.java"

262scope = "source.java"

276injection-regex = "java"

263injection-regex = "java"

277file-types = ["java"]

264file-types = ["java"]

278−shebangs = []

279roots = []

265roots = []

280indent = { tab-width = 4, unit = " " }

266indent = { tab-width = 4, unit = " " }

281

267

@@ -284,7 +270,6 @@ name = "ledger"

284scope = "source.ledger"

270scope = "source.ledger"

285injection-regex = "ledger"

271injection-regex = "ledger"

286file-types = ["ldg", "ledger", "journal"]

272file-types = ["ldg", "ledger", "journal"]

287−shebangs = []

288roots = []

273roots = []

289comment-token = ";"

274comment-token = ";"

290indent = { tab-width = 4, unit = " " }

275indent = { tab-width = 4, unit = " " }

@@ -312,7 +297,7 @@ indent = { tab-width = 2, unit = " "}

312name = "lua"

297name = "lua"

313scope = "source.lua"

298scope = "source.lua"

314file-types = ["lua"]

299file-types = ["lua"]

315−shebangs = []

300+shebangs = ["lua"]

316roots = []

301roots = []

317comment-token = "--"

302comment-token = "--"

318indent = { tab-width = 2, unit = " " }

303indent = { tab-width = 2, unit = " " }

@@ -322,7 +307,6 @@ name = "svelte"

322scope = "source.svelte"

307scope = "source.svelte"

323injection-regex = "svelte"

308injection-regex = "svelte"

324file-types = ["svelte"]

309file-types = ["svelte"]

325−shebangs = []

326roots = []

310roots = []

327indent = { tab-width = 2, unit = " " }

311indent = { tab-width = 2, unit = " " }

328language-server = { command = "svelteserver", args = ["--stdio"] }

312language-server = { command = "svelteserver", args = ["--stdio"] }

@@ -333,7 +317,6 @@ name = "vue"

333scope = "source.vue"

317scope = "source.vue"

334injection-regex = "vue"

318injection-regex = "vue"

335file-types = ["vue"]

319file-types = ["vue"]

336−shebangs = []

337roots = []

320roots = []

338indent = { tab-width = 2, unit = " " }

321indent = { tab-width = 2, unit = " " }

339

322

@@ -341,7 +324,6 @@ indent = { tab-width = 2, unit = " " }

341name = "yaml"

324name = "yaml"

342scope = "source.yaml"

325scope = "source.yaml"

343file-types = ["yml", "yaml"]

326file-types = ["yml", "yaml"]

344−shebangs = []

345roots = []

327roots = []

346comment-token = "#"

328comment-token = "#"

347indent = { tab-width = 2, unit = " " }

329indent = { tab-width = 2, unit = " " }

@@ -361,7 +343,6 @@ name = "zig"

361scope = "source.zig"

343scope = "source.zig"

362injection-regex = "zig"

344injection-regex = "zig"

363file-types = ["zig"]

345file-types = ["zig"]

364−shebangs = []

365roots = ["build.zig"]

346roots = ["build.zig"]

366auto-format = true

347auto-format = true

367comment-token = "//"

348comment-token = "//"

@@ -386,7 +367,6 @@ language-server = { command = "swipl", args = [

386name = "tsq"

367name = "tsq"

387scope = "source.tsq"

368scope = "source.tsq"

388file-types = ["scm"]

369file-types = ["scm"]

389−shebangs = []

390roots = []

370roots = []

391comment-token = ";"

371comment-token = ";"

392indent = { tab-width = 2, unit = " " }

372indent = { tab-width = 2, unit = " " }

@@ -395,7 +375,6 @@ indent = { tab-width = 2, unit = " " }

395name = "cmake"

375name = "cmake"

396scope = "source.cmake"

376scope = "source.cmake"

397file-types = ["cmake", "CMakeLists.txt"]

377file-types = ["cmake", "CMakeLists.txt"]

398−shebangs = []

399roots = []

378roots = []

400comment-token = "#"

379comment-token = "#"

401indent = { tab-width = 2, unit = " " }

380indent = { tab-width = 2, unit = " " }

@@ -405,7 +384,6 @@ language-server = { command = "cmake-language-server" }

405name = "glsl"

384name = "glsl"

406scope = "source.glsl"

385scope = "source.glsl"

407file-types = ["glsl", "vert", "tesc", "tese", "geom", "frag", "comp" ]

386file-types = ["glsl", "vert", "tesc", "tese", "geom", "frag", "comp" ]

408−shebangs = []

409roots = []

387roots = []

410comment-token = "//"

388comment-token = "//"

411indent = { tab-width = 4, unit = " " }

389indent = { tab-width = 4, unit = " " }