Merge branch 'main' of https://github.com/nathom/filetype.nvim

README.md

@@ -300,3 +300,4 @@ All contributions are appreciated! But please make sure to follow these guidelin
 - Format your code with stylua, complying with the rules in the `stylua.toml` file
 - Document any new functions you write, and update the documentation of functions
 you edit if appropriate
+- Set the base branch to `dev`

lua/filetype/mappings.lua

@@ -260,6 +260,7 @@ M.extensions = {
     ["jgr"] = "jgraph",
     ["jj"] = "javacc",
     ["jjt"] = "javacc",
+    ["jl"] = "julia",
     ["jov"] = "jovial",
     ["jovial"] = "jovial",
     ["jpl"] = "jam",
@@ -380,6 +381,7 @@ M.extensions = {
     ["opam.template"] = "opam",
     ["or"] = "openroad",
     ["ora"] = "ora",
+    ["org"] = "org",
     ["orx"] = "rexx",
     ["p36"] = "plm",
     ["p6"] = "raku",
@@ -456,6 +458,8 @@ M.extensions = {
     ["rej"] = "diff",
     ["rem"] = "remind",
     ["remind"] = "remind",
+    ["res"] = "rescript",
+    ["resi"] = "rescript",
     ["rex"] = "rexx",
     ["rexx"] = "rexx",
     ["rexxj"] = "rexx",
@@ -571,6 +575,7 @@ M.extensions = {
     ["toml"] = "toml",
     ["tpl"] = "smarty",
     ["tpm"] = "xml",
+    ["tpp"] = "cpp",
     ["tr"] = "nroff",
     ["tsc"] = "monk",
     ["tsx"] = "typescriptreact",
@@ -742,6 +747,7 @@ M.literal = {
     ["fglrxrc"] = "xml",
     ["fstab"] = "fstab",
     ["gitconfig"] = "gitconfig",
+    ["git-rebase-todo"] = "gitrebase",
     ["gitolite.conf"] = "gitolite",
     ["gnashpluginrc"] = "gnash",
     ["gnashrc"] = "gnash",
@@ -943,6 +949,9 @@ M.star_sets = {
     ["lilo%.conf.*"] = [[lilo]],
     [".*/etc/logcheck/.*%.d.*/.*"] = [[logcheck]],
     ["[mM]akefile.*"] = [[make]],
+    ["mk"] = [[make]],
+    ["mak"] = [[make]],
+    ["dsp"] = [[make]],
     ["[rR]akefile.*"] = [[ruby]],
     ["reportbug-.*"] = [[mail]],
     [".*/etc/modprobe%..*"] = [[modconf]],

stylua.toml

@@ -1,7 +1,7 @@
 # Customized
 indent_type = "Spaces"
+column_width = 79
 # Default
-column_width = 120
 line_endings = "Unix"
 indent_width = 4
 quote_style = "AutoPreferDouble"