Merge branch 'geany:master' into master

data/Makefile.am

@@ -57,7 +57,7 @@ filetypes_dist = \
 	filedefs/filetypes.markdown \
 	filedefs/filetypes.matlab \
 	filedefs/filetypes.Meson.conf \
-	filedefs/filetypes.Nim.conf \
+	filedefs/filetypes.nim \
 	filedefs/filetypes.nsis \
 	filedefs/filetypes.objectivec \
 	filedefs/filetypes.pascal \

data/filedefs/filetypes.nim

@@ -0,0 +1,71 @@
+# For complete documentation of this file, please see Geany's main documentation
+[styling]
+# Edit these in the colorscheme .conf file instead
+default=default
+comment=comment
+commentdoc=comment_doc
+commentline=comment_line
+commentlinedoc=comment_doc
+number=number_1
+string=string_1
+character=character
+word=keyword_1
+triple=string_2
+tripledouble=string_2
+backticks=identifier_1
+funcname=identifier_1
+stringeol=string_eol
+numerror=error
+operator=operator
+identifier=identifier_1
+
+[keywords]
+# all items must be in one line
+keywords=addr and array as asm assert auto bind block bool break byte case cast char concept const continue converter defer discard distinct div do doAssert echo elif else end enum except export false finally float float32 float64 for from func if import in include int int16 int32 int64 int8 interface is isnot iterator lent let macro method mixin mod Natural nil nil not notin object of openArray or Ordinal out parallel Positive proc ptr raise ref result return seq shl shr sink spawn static string template true try tuple type uint uint16 uint32 uint64 uint8 using var when while xor yield
+
+[lexer_properties]
+
+[settings]
+# default extension used when saving files
+extension=nim
+
+# MIME type
+mime_type=text/x-nim
+
+# these characters define word boundaries when making selections and searching
+# using word matching options
+#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+
+# single comments, like # in this file
+comment_single=#
+# multiline comments
+comment_open=#[
+comment_close=]#
+
+# set to false if a comment character/string should start at column 0 of a line, true uses any
+# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d
+# 		#command_example();
+# setting to false would generate this
+# #		command_example();
+# This setting works only for single line comments
+comment_use_indent=true
+
+# context action command (please see Geany's main documentation for details)
+context_action_cmd=
+
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
+[build-menu]
+FT_00_LB=nim c
+FT_00_CM=nim c "%f"
+FT_00_WD=%d
+FT_02_LB=_Lint
+FT_02_CM=nimpretty --maxLineLen:80 "%f"
+EX_01_WD=
+error_regex=(.+)\(([0-9]+),\s+([0-9]+)\)\s+Error
+FT_01_LB=nim r
+FT_01_CM=nim r "%f"
+FT_01_WD=%d

data/filetype_extensions.conf

@@ -88,7 +88,7 @@ None=*;
 
 # Note: restarting is required after editing groups
 [Groups]
-Programming=Arduino;Clojure;CUDA;Cython;Genie;Groovy;Kotlin;Nim;Scala;Swift;
+Programming=Arduino;Clojure;CUDA;Cython;Genie;Groovy;Kotlin;Scala;Swift;
 Script=Dockerfile;Graphviz;TypeScript;Meson;
 Markup=
 Misc=JSON;

meson.build

@@ -272,6 +272,7 @@ lexilla = static_library('lexilla',
 	'scintilla/lexilla/lexers/LexMake.cxx',
 	'scintilla/lexilla/lexers/LexMarkdown.cxx',
 	'scintilla/lexilla/lexers/LexMatlab.cxx',
+	'scintilla/lexilla/lexers/LexNim.cxx',
 	'scintilla/lexilla/lexers/LexNsis.cxx',
 	'scintilla/lexilla/lexers/LexNull.cxx',
 	'scintilla/lexilla/lexers/LexPascal.cxx',

scintilla/Makefile.am

@@ -42,6 +42,7 @@ lexilla/lexers/LexLua.cxx              \
 lexilla/lexers/LexMake.cxx             \
 lexilla/lexers/LexMarkdown.cxx         \
 lexilla/lexers/LexMatlab.cxx           \
+lexilla/lexers/LexNim.cxx              \
 lexilla/lexers/LexNsis.cxx             \
 lexilla/lexers/LexNull.cxx             \
 lexilla/lexers/LexPascal.cxx           \