rouge 4.7.0 → 5.0.0

data/lib/rouge/lexers/gjs.rb

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*- #
 # frozen_string_literal: true
 
+require_relative 'javascript'
+
 module Rouge
   module Lexers
-    load_lexer 'javascript.rb'
-
     class Gjs < Javascript
       title "Template Tag (gjs)"
       desc "Ember.js, JavaScript with <template> tags"

data/lib/rouge/lexers/glsl/builtins.rb

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+# DO NOT EDIT
+# This file is automatically generated by `rake builtins:glsl`.
+# See tasks/builtins/glsl.rake for more info.
+
+module Rouge
+  module Lexers
+    class GLSL
+      BUILTINS = Set["EmitStreamVertex", "EmitVertex", "EndPrimitive", "EndStreamPrimitive", "abs", "acos", "acosh", "all", "allInvocations", "allInvocationsEqual", "any", "anyInvocation", "asin", "asinh", "atan", "atanh", "atomicAdd", "atomicAnd", "atomicCompSwap", "atomicCounter", "atomicCounterAdd", "atomicCounterAnd", "atomicCounterCompSwap", "atomicCounterDecrement", "atomicCounterExchange", "atomicCounterIncrement", "atomicCounterMax", "atomicCounterMin", "atomicCounterOr", "atomicCounterSubtract", "atomicCounterXor", "atomicExchange", "atomicMax", "atomicMin", "atomicOr", "atomicXor", "barrier", "bitCount", "bitfieldExtract", "bitfieldInsert", "bitfieldReverse", "ceil", "clamp", "cos", "cosh", "cross", "dFdx", "dFdxCoarse", "dFdxFine", "dFdy", "dFdyCoarse", "dFdyFine", "degrees", "determinant", "distance", "dot", "equal", "exp", "exp2", "faceforward", "findLSB", "findMSB", "floatBitsToInt", "floatBitsToUint", "floor", "fma", "fract", "frexp", "ftransform", "fwidth", "fwidthCoarse", "fwidthFine", "greaterThan", "greaterThanEqual", "groupMemoryBarrier", "imageAtomicAdd", "imageAtomicAnd", "imageAtomicCompSwap", "imageAtomicExchange", "imageAtomicMax", "imageAtomicMin", "imageAtomicOr", "imageAtomicXor", "imageLoad", "imageSamples", "imageSize", "imageStore", "imulExtended", "intBitsToFloat", "interpolateAtCentroid", "interpolateAtOffset", "interpolateAtSample", "inverse", "inversesqrt", "isinf", "isnan", "ldexp", "length", "lessThan", "lessThanEqual", "log", "log2", "matrixCompMult", "max", "memoryBarrier", "memoryBarrierAtomicCounter", "memoryBarrierBuffer", "memoryBarrierImage", "memoryBarrierShared", "min", "mix", "mod", "modf", "neighbor", "noise1", "noise2", "noise3", "noise4", "normalize", "not", "notEqual", "outerProduct", "packDouble2x32", "packHalf2x16", "packSnorm2x16", "packSnorm4x8", "packUnorm2x16", "packUnorm4x8", "pow", "radians", "reflect", "refract", "round", "roundEven", "shadow1D", "shadow1DLod", "shadow1DProj", "shadow1DProjLod", "shadow2D", "shadow2DLod", "shadow2DProj", "shadow2DProjLod", "sign", "sin", "sinh", "smoothstep", "sqrt", "step", "subpassLoad", "tan", "tanh", "texelFetch", "texelFetchOffset", "texture", "texture1DLod", "texture1DProj", "texture1DProjLod", "texture2DLod", "texture2DProj", "texture2DProjLod", "texture3DLod", "texture3DProj", "texture3DProjLod", "textureCubeLod", "textureGather", "textureGatherOffset", "textureGatherOffsets", "textureGrad", "textureGradOffset", "textureLod", "textureLodOffset", "textureOffset", "textureProj", "textureProjGrad", "textureProjGradOffset", "textureProjLod", "textureProjLodOffset", "textureProjOffset", "textureQueryLevels", "textureQueryLod", "textureSamples", "textureSize", "transpose", "trunc", "uaddCarry", "uintBitsToFloat", "umulExtended", "unpackDouble2x32", "unpackHalf2x16", "unpackSnorm2x16", "unpackSnorm4x8", "unpackUnorm2x16", "unpackUnorm4x8", "usubBorrow"]
+      KEYWORDS = Set["active", "asm", "attribute", "break", "buffer", "case", "cast", "centroid", "class", "coherent", "common", "const", "continue", "default", "discard", "do", "else", "enum", "extern", "external", "false", "filter", "fixed", "flat", "for", "fvec2", "fvec3", "fvec4", "goto", "half", "highp", "hvec2", "hvec3", "hvec4", "if", "in", "inline", "inout", "input", "interface", "invariant", "layout", "long", "lowp", "mediump", "namespace", "noinline", "noperspective", "out", "output", "partition", "patch", "precise", "precision", "public", "readonly", "resource", "restrict", "return", "sample", "sampler3DRect", "shared", "short", "sizeof", "smooth", "static", "struct", "subroutine", "superp", "switch", "template", "this", "true", "typedef", "uniform", "union", "unsigned", "using", "varying", "volatile", "while", "writeonly"]
+      TYPES = Set["atomic_uint", "bool", "bvec2", "bvec3", "bvec4", "dmat2", "dmat2x2", "dmat2x3", "dmat2x4", "dmat3", "dmat3x2", "dmat3x3", "dmat3x4", "dmat4", "dmat4x2", "dmat4x3", "dmat4x4", "double", "dvec2", "dvec3", "dvec4", "float", "iimage1D", "iimage1DArray", "iimage2D", "iimage2DArray", "iimage2DMS", "iimage2DMSArray", "iimage2DRect", "iimage3D", "iimageBuffer", "iimageCube", "iimageCubeArray", "image1D", "image1DArray", "image2D", "image2DArray", "image2DMS", "image2DMSArray", "image2DRect", "image3D", "imageBuffer", "imageCube", "imageCubeArray", "int", "isampler1D", "isampler1DArray", "isampler2D", "isampler2DArray", "isampler2DMS", "isampler2DMSArray", "isampler2DRect", "isampler3D", "isamplerBuffer", "isamplerCube", "isamplerCubeArray", "isubpassInput", "isubpassInputMS", "itexture1D", "itexture1DArray", "itexture2D", "itexture2DArray", "itexture2DMS", "itexture2DMSArray", "itexture2DRect", "itexture3D", "itextureBuffer", "itextureCube", "itextureCubeArray", "ivec2", "ivec3", "ivec4", "mat2", "mat2x2", "mat2x3", "mat2x4", "mat3", "mat3x2", "mat3x3", "mat3x4", "mat4", "mat4x2", "mat4x3", "mat4x4", "sampler", "sampler1D", "sampler1DArray", "sampler1DArrayShadow", "sampler1DShadow", "sampler2D", "sampler2DArray", "sampler2DArrayShadow", "sampler2DMS", "sampler2DMSArray", "sampler2DRect", "sampler2DRectShadow", "sampler2DShadow", "sampler3D", "samplerBuffer", "samplerCube", "samplerCubeArray", "samplerCubeArrayShadow", "samplerCubeShadow", "samplerShadow", "subpassInput", "subpassInputMS", "texture1D", "texture1DArray", "texture2D", "texture2DArray", "texture2DMS", "texture2DMSArray", "texture2DRect", "texture3D", "textureBuffer", "textureCube", "textureCubeArray", "uimage1D", "uimage1DArray", "uimage2D", "uimage2DArray", "uimage2DMS", "uimage2DMSArray", "uimage2DRect", "uimage3D", "uimageBuffer", "uimageCube", "uimageCubeArray", "uint", "usampler1D", "usampler1DArray", "usampler2D", "usampler2DArray", "usampler2DMS", "usampler2DMSArray", "usampler2DRect", "usampler3D", "usamplerBuffer", "usamplerCube", "usamplerCubeArray", "usubpassInput", "usubpassInputMS", "utexture1D", "utexture1DArray", "utexture2D", "utexture2DArray", "utexture2DMS", "utexture2DMSArray", "utexture2DRect", "utexture3D", "utextureBuffer", "utextureCube", "utextureCubeArray", "uvec2", "uvec3", "uvec4", "vec2", "vec3", "vec4", "void"]
+      GL_VARS = Set["gl_BackColor", "gl_BackLightModelProduct", "gl_BackLightProduct", "gl_BackMaterial", "gl_BackSecondaryColor", "gl_BaseInstance", "gl_BaseVertex", "gl_BoundingBox", "gl_ClipDistance", "gl_ClipPlane", "gl_ClipVertex", "gl_Color", "gl_CullDistance", "gl_DepthRange", "gl_DepthRangeParameters", "gl_DrawID", "gl_EyePlaneQ", "gl_EyePlaneR", "gl_EyePlaneS", "gl_EyePlaneT", "gl_Fog", "gl_FogCoord", "gl_FogFragCoord", "gl_FogParameters", "gl_FragColor", "gl_FragCoord", "gl_FragData", "gl_FragDepth", "gl_FrontColor", "gl_FrontFacing", "gl_FrontLightModelProduct", "gl_FrontLightProduct", "gl_FrontMaterial", "gl_FrontSecondaryColor", "gl_GlobalInvocationID", "gl_HelperInvocation", "gl_InstanceID", "gl_InstanceIndex", "gl_InvocationID", "gl_Layer", "gl_LightModel", "gl_LightModelParameters", "gl_LightModelProducts", "gl_LightProducts", "gl_LightSource", "gl_LightSourceParameters", "gl_LocalInvocationID", "gl_LocalInvocationIndex", "gl_MaterialParameters", "gl_MaxAtomicCounterBindings", "gl_MaxAtomicCounterBufferSize", "gl_MaxClipDistances", "gl_MaxClipPlanes", "gl_MaxCombinedAtomicCounterBuffers", "gl_MaxCombinedAtomicCounters", "gl_MaxCombinedClipAndCullDistances", "gl_MaxCombinedImageUniforms", "gl_MaxCombinedImageUnitsAndFragmentOutputs", "gl_MaxCombinedShaderOutputResources", "gl_MaxCombinedTextureImageUnits", "gl_MaxComputeAtomicCounterBuffers", "gl_MaxComputeAtomicCounters", "gl_MaxComputeImageUniforms", "gl_MaxComputeTextureImageUnits", "gl_MaxComputeUniformComponents", "gl_MaxComputeWorkGroupCount", "gl_MaxComputeWorkGroupSize", "gl_MaxCullDistances", "gl_MaxDrawBuffers", "gl_MaxFragmentAtomicCounterBuffers", "gl_MaxFragmentAtomicCounters", "gl_MaxFragmentImageUniforms", "gl_MaxFragmentInputComponents", "gl_MaxFragmentInputVectors", "gl_MaxFragmentUniformComponents", "gl_MaxFragmentUniformVectors", "gl_MaxGeometryAtomicCounterBuffers", "gl_MaxGeometryAtomicCounters", "gl_MaxGeometryImageUniforms", "gl_MaxGeometryInputComponents", "gl_MaxGeometryOutputComponents", "gl_MaxGeometryOutputVertices", "gl_MaxGeometryTextureImageUnits", "gl_MaxGeometryTotalOutputComponents", "gl_MaxGeometryUniformComponents", "gl_MaxGeometryVaryingComponents", "gl_MaxImageSamples", "gl_MaxImageUnits", "gl_MaxInputAttachments", "gl_MaxLights", "gl_MaxPatchVertices", "gl_MaxProgramTexelOffset", "gl_MaxSamples", "gl_MaxTessControlAtomicCounterBuffers", "gl_MaxTessControlAtomicCounters", "gl_MaxTessControlImageUniforms", "gl_MaxTessControlInputComponents", "gl_MaxTessControlOutputComponents", "gl_MaxTessControlTextureImageUnits", "gl_MaxTessControlTotalOutputComponents", "gl_MaxTessControlUniformComponents", "gl_MaxTessEvaluationAtomicCounterBuffers", "gl_MaxTessEvaluationAtomicCounters", "gl_MaxTessEvaluationImageUniforms", "gl_MaxTessEvaluationInputComponents", "gl_MaxTessEvaluationOutputComponents", "gl_MaxTessEvaluationTextureImageUnits", "gl_MaxTessEvaluationUniformComponents", "gl_MaxTessGenLevel", "gl_MaxTessPatchComponents", "gl_MaxTextureCoords", "gl_MaxTextureImageUnits", "gl_MaxTextureUnits", "gl_MaxTransformFeedbackBuffers", "gl_MaxTransformFeedbackInterleavedComponents", "gl_MaxVaryingComponents", "gl_MaxVaryingFloats", "gl_MaxVaryingVectors", "gl_MaxVertexAtomicCounterBuffers", "gl_MaxVertexAtomicCounters", "gl_MaxVertexAttribs", "gl_MaxVertexImageUniforms", "gl_MaxVertexOutputComponents", "gl_MaxVertexOutputVectors", "gl_MaxVertexTextureImageUnits", "gl_MaxVertexUniformComponents", "gl_MaxVertexUniformVectors", "gl_MaxViewports", "gl_MinProgramTexelOffset", "gl_ModelViewMatrix", "gl_ModelViewMatrixInverse", "gl_ModelViewMatrixInverseTranspose", "gl_ModelViewMatrixTranspose", "gl_ModelViewProjectionMatrix", "gl_ModelViewProjectionMatrixInverse", "gl_ModelViewProjectionMatrixInverseTranspose", "gl_ModelViewProjectionMatrixTranspose", "gl_MultiTexCoord0", "gl_MultiTexCoord1", "gl_MultiTexCoord2", "gl_MultiTexCoord3", "gl_MultiTexCoord4", "gl_MultiTexCoord5", "gl_MultiTexCoord6", "gl_MultiTexCoord7", "gl_Normal", "gl_NormalMatrix", "gl_NormalScale", "gl_NumSamples", "gl_NumWorkGroups", "gl_ObjectPlaneQ", "gl_ObjectPlaneR", "gl_ObjectPlaneS", "gl_ObjectPlaneT", "gl_PatchVerticesIn", "gl_PerFragment", "gl_PerVertex", "gl_Point", "gl_PointCoord", "gl_PointParameters", "gl_PointSize", "gl_Position", "gl_PrimitiveID", "gl_PrimitiveIDIn", "gl_ProjectionMatrix", "gl_ProjectionMatrixInverse", "gl_ProjectionMatrixInverseTranspose", "gl_ProjectionMatrixTranspose", "gl_SampleID", "gl_SampleMask", "gl_SampleMaskIn", "gl_SamplePosition", "gl_SecondaryColor", "gl_TessCoord", "gl_TessLevelInner", "gl_TessLevelOuter", "gl_TexCoord", "gl_TextureEnvColor", "gl_TextureMatrix", "gl_TextureMatrixInverse", "gl_TextureMatrixInverseTranspose", "gl_TextureMatrixTranspose", "gl_Vertex", "gl_VertexID", "gl_VertexIndex", "gl_ViewportIndex", "gl_WorkGroupID", "gl_WorkGroupSize", "gl_color", "gl_in", "gl_out"]
+    end
+  end
+end

data/lib/rouge/lexers/glsl.rb

@@ -1,15 +1,11 @@
 # -*- coding: utf-8 -*- #
 # frozen_string_literal: true
 
+require_relative 'c'
+
 module Rouge
   module Lexers
-    load_lexer 'c.rb'
-
-    # This file defines the GLSL language lexer to the Rouge
-    # syntax highlighter.
-    #
-    # Author: Sri Harsha Chilakapati
-    class Glsl < C
+    class GLSL < RegexLexer
       tag 'glsl'
       filenames '*.glsl', '*.frag', '*.vert', '*.geom', '*.vs', '*.gs', '*.shader'
       mimetypes 'x-shader/x-vertex', 'x-shader/x-fragment', 'x-shader/x-geometry'
@@ -17,116 +13,57 @@ module Rouge
       title "GLSL"
       desc "The GLSL shader language"
 
-      def self.keywords
-        @keywords ||= Set.new %w(
-          attribute const uniform varying
-          layout
-          centroid flat smooth noperspective
-          patch sample
-          break continue do for while switch case default
-          if else
-          subroutine
-          in out inout
-          invariant
-          discard return struct precision
-        )
-      end
+      lazy { require_relative "glsl/builtins" }
 
-      def self.keywords_type
-        @keywords_type ||= Set.new %w(
-          float double int void bool true false
-          lowp mediump highp
-          mat2 mat3 mat4 dmat2 dmat3 dmat4
-          mat2x2 mat2x3 mat2x4 dmat2x2 dmat2x3 dmat2x4
-          mat3x2 mat3x3 mat3x4 dmat3x2 dmat3x3 dmat3x4
-          mat4x2 mat4x3 mat4x4 dmat4x2 dmat4x3 dmat4x4
-          vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 dvec2 dvec3 dvec4
-          uint uvec2 uvec3 uvec4
-          sampler1D sampler2D sampler3D samplerCube
-          sampler1DShadow sampler2DShadow samplerCubeShadow
-          sampler1DArray sampler2DArray
-          sampler1DArrayShadow sampler2DArrayShadow
-          isampler1D isampler2D isampler3D isamplerCube
-          isampler1DArray isampler2DArray
-          usampler1D usampler2D usampler3D usamplerCube
-          usampler1DArray usampler2DArray
-          sampler2DRect sampler2DRectShadow isampler2DRect usampler2DRect
-          samplerBuffer isamplerBuffer usamplerBuffer
-          sampler2DMS isampler2DMS usampler2DMS
-          sampler2DMSArray isampler2DMSArray usampler2DMSArray
-          samplerCubeArray samplerCubeArrayShadow isamplerCubeArray usamplerCubeArray
-        )
-      end
+      state :root do
+        rule %r/\s+/, Text
+        rule %r(/[*].*?[*]/)m, Comment::Multiline
+        rule %r(//.*$), Comment
 
-      def self.reserved
-        @reserved ||= Set.new %w(
-          common partition active
-          asm
-          class union enum typedef template this packed
-          goto
-          inline noinline volatile public static extern external interface
-          long short half fixed unsigned superp
-          input output
-          hvec2 hvec3 hvec4 fvec2 fvec3 fvec4
-          sampler3DRect
-          filter
-          image1D image2D image3D imageCube
-          iimage1D iimage2D iimage3D iimageCube
-          uimage1D uimage2D uimage3D uimageCube
-          image1DArray image2DArray
-          iimage1DArray iimage2DArray uimage1DArray uimage2DArray
-          image1DShadow image2DShadow
-          image1DArrayShadow image2DArrayShadow
-          imageBuffer iimageBuffer uimageBuffer
-          sizeof cast
-          namespace using
-          row_major
-        )
-      end
+        rule %r/^#(?:[^\n]|\\\r?\n)*/, Comment::Preproc
+        rule %r/defined\b/, Comment::Preproc
+        rule %r/__(?:LINE|FILE|VERSION)__\b/, Keyword::Constant
+        rule %r/(?:true|false)\b/, Keyword::Pseudo
 
-      def self.builtins
-        @builtins ||= Set.new %w(
-          gl_VertexID gl_InstanceID gl_PerVertex gl_Position gl_PointSize gl_ClipDistance
-          gl_PrimitiveIDIn gl_InvocationID gl_PrimitiveID gl_Layer gl_ViewportIndex
-          gl_MaxPatchVertices gl_PatchVerticesIn gl_TessLevelOuter gl_TessLevelInner
-          gl_TessCoord gl_FragCoord gl_FrontFacing gl_PointCoord gl_SampleID gl_SamplePosition
-          gl_FragColor gl_FragData gl_MaxDrawBuffers gl_FragDepth gl_SampleMask
-          gl_ClipVertex gl_FrontColor gl_BackColor gl_FrontSecondaryColor gl_BackSecondaryColor
-          gl_TexCoord gl_FogFragCoord gl_Color gl_SecondaryColor gl_Normal gl_VertexID
-          gl_MultiTexCord0 gl_MultiTexCord1 gl_MultiTexCord2 gl_MultiTexCord3
-          gl_MultiTexCord4 gl_MultiTexCord5 gl_MultiTexCord6 gl_MultiTexCord7
-          gl_FogCoord gl_MaxVertexAttribs gl_MaxVertexUniformComponents
-          gl_MaxVaryingFloats gl_MaxVaryingComponents gl_MaxVertexOutputComponents
-          gl_MaxGeometryInputComponents gl_MaxGeometryOutputComponents
-          gl_MaxFragmentInputComponents gl_MaxVertexTextureImageUnits
-          gl_MaxCombinedTextureImageUnits gl_MaxTextureImageUnits
-          gl_MaxFragmentUniformComponents gl_MaxClipDistances
-          gl_MaxGeometryTextureImageUnits gl_MaxGeometryUniformComponents
-          gl_MaxGeometryVaryingComponents gl_MaxTessControlInputComponents
-          gl_MaxTessControlOutputComponents gl_MaxTessControlTextureImageUnits
-          gl_MaxTessControlUniformComponents gl_MaxTessControlTotalOutputComponents
-          gl_MaxTessEvaluationInputComponents gl_MaxTessEvaluationOutputComponents
-          gl_MaxTessEvaluationTextureImageUnits gl_MaxTessEvaluationUniformComponents
-          gl_MaxTessPatchComponents gl_MaxTessGenLevel gl_MaxViewports
-          gl_MaxVertexUniformVectors gl_MaxFragmentUniformVectors gl_MaxVaryingVectors
-          gl_MaxTextureUnits gl_MaxTextureCoords gl_MaxClipPlanes gl_DepthRange
-          gl_DepthRangeParameters gl_ModelViewMatrix gl_ProjectionMatrix
-          gl_ModelViewProjectionMatrix gl_TextureMatrix gl_NormalMatrix
-          gl_ModelViewMatrixInverse gl_ProjectionMatrixInverse gl_ModelViewProjectionMatrixInverse
-          gl_TextureMatrixInverse gl_ModelViewMatrixTranspose
-          gl_ModelViewProjectionMatrixTranspose gl_TextureMatrixTranspose
-          gl_ModelViewMatrixInverseTranspose gl_ProjectionMatrixInverseTranspose
-          gl_ModelViewProjectionMatrixInverseTranspose
-          gl_TextureMatrixInverseTranspose gl_NormalScale gl_ClipPlane gl_PointParameters
-          gl_Point gl_MaterialParameters gl_FrontMaterial gl_BackMaterial
-          gl_LightSourceParameters gl_LightSource gl_MaxLights gl_LightModelParameters
-          gl_LightModel gl_LightModelProducts gl_FrontLightModelProduct
-          gl_BackLightModelProduct gl_LightProducts gl_FrontLightProduct
-          gl_BackLightProduct gl_TextureEnvColor gl_EyePlaneS gl_EyePlaneT gl_EyePlaneR
-          gl_EyePlaneQ gl_ObjectPlaneS gl_ObjectPlaneT gl_ObjectPlaneR gl_ObjectPlaneQ
-          gl_FogParameters gl_Fog
-        )
+        rule %r/0x\h+u?/i, Num::Hex
+        rule %r/(?:\d+[.]\d*|[.]\d+)(?:e[+-]?\d+)?(?:l?f)?/i, Num::Float
+        rule %r/\d+(?:e[+-]?\d+)(?:l?f)?/i, Num::Float
+        rule %r/[1-9]\d*u?/i, Num::Integer
+        rule %r/0[0-7]+/, Num::Oct
+        rule %r/0/, Num::Integer
+        rule %r([-.+/*%<>\[\](){}^|&~=!:;,?]), Punctuation
+
+        rule %r/\w+/ do |m|
+          if KEYWORDS.include?(m[0])
+            token Keyword
+          elsif TYPES.include?(m[0])
+            token Keyword::Type
+          else
+            fallthrough!
+          end
+        end
+
+        rule %r/\w+(?=\s*[(])/ do |m|
+          if BUILTINS.include?(m[0])
+            token Name::Builtin
+          else
+            token Name::Function
+          end
+        end
+
+        rule %r/\w+/ do |m|
+          if GL_VARS.include?(m[0])
+            token Name::Constant
+          elsif BUILTINS.include?(m[0])
+            token Name::Builtin
+          else
+            token Name
+          end
+        end
       end
     end
+
+    # backcompat
+    Glsl = GLSL
   end
 end

data/lib/rouge/lexers/go.rb

@@ -127,7 +127,7 @@ module Rouge
                                | rune       | string     | uint8
                                | uint16     | uint32     | uint64
                                | uintptr    | uint
-      	                       )\b/x
+                               )\b/x
 
       PREDECLARED_CONSTANTS  = /\b(?:true|false|iota|nil)\b/
 

data/lib/rouge/lexers/gradle.rb

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*- #
 # frozen_string_literal: true
 
+require_relative 'groovy'
+
 module Rouge
   module Lexers
-    load_lexer 'groovy.rb'
-
     class Gradle < Groovy
       title "Gradle"
       desc "A powerful build system for the JVM"

data/lib/rouge/lexers/groovy.rb

@@ -42,6 +42,12 @@ module Rouge
       end
 
       state :root do
+        # groovy allows a file to start with a shebang
+        rule %r/\A#!(.*?)$/, Comment::Preproc
+        rule %r//, Text, :base
+      end
+
+      state :base do
         rule %r(^
           (\s*(?:\w[\w.\[\]]*\s+)+?) # return arguments
           (\w\w*) # method name

data/lib/rouge/lexers/gts.rb

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*- #
 # frozen_string_literal: true
 
+require_relative 'typescript'
+
 module Rouge
   module Lexers
-    load_lexer 'typescript.rb'
-
     class Gts < Typescript
       title "Template Tag (gts)"
       desc "Ember.js, TypeScript with <template> tags"

data/lib/rouge/lexers/hack.rb

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*- #
 # frozen_string_literal: true
 
+require_relative 'php'
+
 module Rouge
   module Lexers
-    load_lexer 'php.rb'
-
     class Hack < PHP
       title 'Hack'
       desc 'The Hack programming language (hacklang.org)'
@@ -13,16 +13,14 @@ module Rouge
       filenames '*.php', '*.hh'
 
       def self.detect?(text)
-        return true if /<\?hh/ =~ text
+        return true if text.start_with?('<?hh')
         return true if text.shebang?('hhvm')
-        return true if /async function [a-zA-Z]/ =~ text
-        return true if /\): Awaitable</ =~ text
 
         return false
       end
 
       def self.keywords
-        @hh_keywords ||= super.merge Set.new %w(
+        @keywords ||= super.merge Set.new %w(
           type newtype enum
           as super
           async await Awaitable

data/lib/rouge/lexers/haxe.rb

@@ -139,7 +139,7 @@ module Rouge
       state :root do
         rule %r/\n/, Text, :statement
         rule %r(\{), Punctuation, :expr_start
-        
+
         mixin :comments_and_whitespace
 
         rule %r/@/, Name::Decorator, :metadata
@@ -254,7 +254,7 @@ module Rouge
         rule %r/\\x\h{2}/, Str::Escape
         rule %r/\\u\h{4}/, Str::Escape
         rule %r/\\u\{\h{1,6}\}/, Str::Escape
-      end 
+      end
 
       state :str_interpol do
         rule %r/\}/, Str::Interpol, :pop!

data/lib/rouge/lexers/hlsl.rb

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*- #
 # frozen_string_literal: true
 
+require_relative 'c'
+
 module Rouge
   module Lexers
-    load_lexer 'c.rb'
-
     class HLSL < C
       title "HLSL"
       desc "HLSL, the High Level Shading Language for DirectX (docs.microsoft.com/en-us/windows/win32/direct3dhlsl/dx-graphics-hlsl)"
@@ -74,7 +74,7 @@ module Rouge
       def self.builtins
         @builtins ||= Set.new %w(
           abort abs acos all AllMemoryBarrier AllMemoryBarrierWithGroupSync any
-          AppendStructuredBuffer asdouble asfloat asin asint asuint asuint atan
+          AppendStructuredBuffer asdouble asfloat asin asint asuint atan
           atan2 ceil CheckAccessFullyMapped clamp clip CompileShader
           ConsumeStructuredBuffer cos cosh countbits cross D3DCOLORtoUBYTE4 ddx
           ddx_coarse ddx_fine ddy ddy_coarse ddy_fine degrees determinant
@@ -95,9 +95,9 @@ module Rouge
           ProcessTriTessFactorsAvg ProcessTriTessFactorsMax
           ProcessTriTessFactorsMin QuadReadLaneAt QuadSwapX QuadSwapY radians
           rcp reflect refract reversebits round rsqrt saturate sign sin sincos
-          sinh smoothstep sqrt step tan tanh tex1D tex1D tex1Dbias tex1Dgrad
-          tex1Dlod tex1Dproj tex2D tex2D tex2Dbias tex2Dgrad tex2Dlod tex2Dproj
-          tex3D tex3D tex3Dbias tex3Dgrad tex3Dlod tex3Dproj texCUBE texCUBE
+          sinh smoothstep sqrt step tan tanh tex1D tex1Dbias tex1Dgrad
+          tex1Dlod tex1Dproj tex2D tex2Dbias tex2Dgrad tex2Dlod tex2Dproj
+          tex3D tex3Dbias tex3Dgrad tex3Dlod tex3Dproj texCUBE
           texCUBEbias texCUBEgrad texCUBElod texCUBEproj transpose trunc
           WaveAllBitAnd WaveAllMax WaveAllMin WaveAllBitOr WaveAllBitXor
           WaveAllEqual WaveAllProduct WaveAllSum WaveAllTrue WaveAnyTrue

data/lib/rouge/lexers/hocon.rb

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*- #
 # frozen_string_literal: true
 
+require_relative 'json'
+
 module Rouge
   module Lexers
-    load_lexer 'json.rb'
-
     class HOCON < JSON
       title 'HOCON'
       desc "Human-Optimized Config Object Notation (https://github.com/lightbend/config)"

data/lib/rouge/lexers/hql.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*- #
 
+require_relative 'sql'
+
 module Rouge
   module Lexers
-    load_lexer 'sql.rb'
-
     class HQL < SQL
       title "HQL"
       desc "Hive Query Language SQL dialect"
@@ -40,7 +40,7 @@ module Rouge
           CURRENT_DATE CURRENT_TIMESTAMP CURSOR DATABASE DATE DECIMAL DELETE
           DESCRIBE DISTINCT DOUBLE DROP ELSE END EXCHANGE EXISTS EXTENDED
           EXTERNAL FALSE FETCH FLOAT FOLLOWING FOR FROM FULL FUNCTION GRANT
-          GROUP GROUPING HAVING IF IMPORT IN INNER INSERT INT INTERSECT
+          GROUP GROUPING HAVING IMPORT IN INNER INSERT INT INTERSECT
           INTERVAL INTO IS JOIN LATERAL LEFT LESS LIKE LOCAL MACRO MAP MORE
           NONE NOT NULL OF ON OR ORDER OUT OUTER OVER PARTIALSCAN PARTITION
           PERCENT PRECEDING PRESERVE PROCEDURE RANGE READS REDUCE REVOKE RIGHT
@@ -50,7 +50,7 @@ module Rouge
 
           AUTOCOMMIT ISOLATION LEVEL OFFSET SNAPSHOT TRANSACTION WORK WRITE
 
-          COMMIT ONLY REGEXP RLIKE ROLLBACK START
+          COMMIT ONLY ROLLBACK START
 
           ABORT KEY LAST NORELY NOVALIDATE NULLS RELY VALIDATE
 
@@ -66,35 +66,31 @@ module Rouge
 
           NAMED_STRUCT CREATE_UNION
 
-          ROUND BROUND FLOOR CEIL CEILING RAND EXP LN LOG10 LOG2 LOG POW POWER SQRT BIN
+          ROUND BROUND CEIL CEILING RAND EXP LN LOG10 LOG2 LOG POW POWER SQRT BIN
           HEX UNHEX CONV ABS PMOD SIN ASIN COS ACOS TAN ATAN DEGREES RADIANS POSITIVE
           NEGATIVE SIGN E PI FACTORIAL CBRT SHIFTLEFT SHIFTRIGHT SHIFTRIGHTUNSIGNED
-          GREATEST LEAST WIDTH_BUCKET SIZE SIZE MAP_KEYS MAP_VALUES ARRAY_CONTAINS
-          SORT_ARRAY BINARY CAST FROM_UNIXTIME UNIX_TIMESTAMP UNIX_TIMESTAMP
-          UNIX_TIMESTAMP TO_DATE YEAR QUARTER MONTH DAY DAYOFMONTH HOUR MINUTE SECOND
-          WEEKOFYEAR EXTRACT DATEDIFF DATE_ADD DATE_SUB FROM_UTC_TIMESTAMP
-          TO_UTC_TIMESTAMP CURRENT_DATE CURRENT_TIMESTAMP ADD_MONTHS LAST_DAY NEXT_DAY
-          TRUNC MONTHS_BETWEEN DATE_FORMAT IF ISNULL ISNOTNULL  NVL COALESCE CASE WHEN
+          GREATEST LEAST WIDTH_BUCKET SIZE MAP_KEYS MAP_VALUES ARRAY_CONTAINS
+          SORT_ARRAY FROM_UNIXTIME UNIX_TIMESTAMP TO_DATE DAYOFMONTH
+          WEEKOFYEAR DATEDIFF DATE_ADD DATE_SUB FROM_UTC_TIMESTAMP
+          TO_UTC_TIMESTAMP ADD_MONTHS LAST_DAY NEXT_DAY
+          TRUNC MONTHS_BETWEEN DATE_FORMAT ISNULL ISNOTNULL  NVL COALESCE
           then else end NULLIF ASSERT_TRUE ASCII BASE64 CHARACTER_LENGTH CHR CONCAT
-          CONTEXT_NGRAMS CONCAT_WS CONCAT_WS DECODE ELT ENCODE FIELD  FIND_IN_SET
+          CONTEXT_NGRAMS CONCAT_WS DECODE ELT ENCODE FIELD  FIND_IN_SET
           FORMAT_NUMBER GET_JSON_OBJECT IN_FILE INSTR LENGTH LOCATE LOWER LCASE LPAD LTRIM
-          NGRAMS OCTET_LENGTH PARSE_URL PRINTF REGEXP_EXTRACT REGEXP_REPLACE REPEAT
-          REPLACE REVERSE RPAD RTRIM SENTENCES SPACE SPLIT STR_TO_MAP SUBSTR SUBSTRING
+          NGRAMS OCTET_LENGTH PARSE_URL PRINTF REGEXP_EXTRACT REGEXP_REPLACE REPEAT REVERSE RPAD RTRIM SENTENCES SPACE SPLIT STR_TO_MAP SUBSTR SUBSTRING
           SUBSTRING_INDEX TRANSLATE TRIM UNBASE64 UPPER UCASE INITCAP LEVENSHTEIN SOUNDEX
           MASK MASK_FIRST_N MASK_LAST_N MASK_SHOW_FIRST_N MASK_SHOW_LAST_N MASK_HASH
           JAVA_METHOD REFLECT HASH CURRENT_USER LOGGED_IN_USER CURRENT_DATABASE MD5 SHA1
           SHA CRC32 SHA2 AES_ENCRYPT AES_DECRYPT VERSION COUNT SUM AVG MIN MAX VARIANCE
           VAR_POP VAR_SAMP STDDEV_POP STDDEV_SAMP COVAR_POP COVAR_SAMP CORR PERCENTILE
-          PERCENTILE_APPROX PERCENTILE_APPROX REGR_AVGX REGR_AVGY REGR_COUNT
+          PERCENTILE_APPROX REGR_AVGX REGR_AVGY REGR_COUNT
           REGR_INTERCEPT REGR_R2 REGR_SLOPE REGR_SXX REGR_SXY REGR_SYY HISTOGRAM_NUMERIC
-          COLLECT_SET COLLECT_LIST NTILE EXPLODE EXPLODE POSEXPLODE INLINE STACK
+          COLLECT_SET COLLECT_LIST NTILE EXPLODE POSEXPLODE INLINE STACK
 
           JSON_TUPLE PARSE_URL_TUPLE
 
           XPATH XPATH_SHORT XPATH_INT XPATH_LONG XPATH_FLOAT XPATH_DOUBLE
-          XPATH_NUMBER XPATH_STRING GET_JSON_OBJECT JSON_TUPLE
-
-          PARSE_URL_TUPLE
+          XPATH_NUMBER XPATH_STRING
         ))
       end
 

data/lib/rouge/lexers/idris.rb

@@ -112,7 +112,7 @@ module Rouge
 
         rule %r/\[\s*\]/, Keyword::Type
         rule %r/\(\s*\)/, Name::Builtin
-        
+
         # Quasiquotations
         rule %r/(\[)([_a-z][\w']*)(\|)/ do |m|
           token Operator, m[1]