kacperek18

Gemfile

@@ -3,4 +3,4 @@ gem 'bundler'
 gem 'deep_clone'
 gem 'walk_up', ">=1.0.1"
 
-gem 'ruby_grammar_builder', '1.1.8'
+gem 'ruby_grammar_builder', '1.1.10'

Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     deep_clone (0.0.1)
-    ruby_grammar_builder (1.1.8)
+    ruby_grammar_builder (1.1.10)
       deep_clone (~> 0.0.1, >= 0.0.1)
     walk_up (1.0.1)
 
@@ -12,7 +12,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   deep_clone
-  ruby_grammar_builder (= 1.1.8)
+  ruby_grammar_builder (= 1.1.10)
   walk_up (>= 1.0.1)
 
 BUNDLED WITH

README.md

@@ -1,14 +1,6 @@
 <p align="center">
     <img height="90" alt="Screen Shot 2022-02-11 at 12 01 19 PM" src="https://user-images.githubusercontent.com/17692058/153645502-f106a481-faaf-450f-9f5e-10da3981d8dc.png">
 </p>
-<p align="center">
-    <a href="https://marketplace.visualstudio.com/items?itemName=jeff-hykin.better-cpp-syntax">
-        <img src="https://vsmarketplacebadge.apphb.com/downloads-short/jeff-hykin.better-cpp-syntax.svg?style=for-the-badge&colorA=5DDB61&colorB=4BC74F&label=DOWNLOADS" />
-    </a>
-    <a href="https://marketplace.visualstudio.com/items?itemName=jeff-hykin.better-cpp-syntax">
-        <img src="https://vsmarketplacebadge.apphb.com/rating-star/jeff-hykin.better-cpp-syntax.svg?style=for-the-badge&colorA=FBBD30&colorB=F2AA08" />
-    </a>
-</p>
 
 # Sponsors
 
@@ -49,13 +41,17 @@ NOTE: The default VS Code theme does not color much. Switch to the Dark+ theme (
 - [Syntax Highlight Theme](https://marketplace.visualstudio.com/items?itemName=peaceshi.syntax-highlight)
 - [Default Theme Enhanced](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools-themes)
 
-## How do I use it?
+## How do I use the extension?
 Just install the VS Code extension and the changes will automatically be applied to all relevant files.
 <br>Link: https://marketplace.visualstudio.com/items?itemName=jeff-hykin.better-cpp-syntax
 
 # Comparison (Material Theme)
 <img width="2794" alt="compare" src="https://user-images.githubusercontent.com/17692058/153653793-3685ffd5-cf96-43c3-a883-da79ba33d037.png">
 
+## How do I use the grammar? (as an upstream for my non-vs code editor)
+
+1. Watch the the "Major Changes" thread [here](https://github.com/jeff-hykin/better-cpp-syntax/issues/64) to know when I change licenses, the codebase structure, or just major highlighting changes.
+2. I support non-VS Code usecases. E.g. yes, you are welcome to open issues [like this one](https://github.com/jeff-hykin/better-cpp-syntax/issues/653) that don't affect VS Code.
 
 ## What is different from atom/language-c?
 It fixes:

autogenerated/cpp_scopes.txt

@@ -17,6 +17,7 @@ constant.numeric.octal.cpp
 constant.other.placeholder
 entity.name.function.call.cpp
 entity.name.function.call.initializer.cpp
+entity.name.function.call.upper-case.cpp
 entity.name.function.constructor.cpp
 entity.name.function.definition.cpp
 entity.name.function.definition.special.constructor.cpp
@@ -132,13 +133,18 @@ keyword.other.default.function.cpp
 keyword.other.delete.constructor.cpp
 keyword.other.delete.destructor.cpp
 keyword.other.delete.function.cpp
+keyword.other.functionlike.cpp
 keyword.other.namespace.alias.cpp
 keyword.other.namespace.definition.cpp
 keyword.other.namespace.directive.cpp
 keyword.other.operator.overload.cpp
 keyword.other.parameter.direction.$0.cpp
-keyword.other.static_assert.cpp
+keyword.other.requires.cpp
+keyword.other.static-assert.cpp
+keyword.other.suffix.literal.built-in.floating-point.cpp
+keyword.other.suffix.literal.built-in.integer.cpp
 keyword.other.suffix.literal.user-defined.character.cpp
+keyword.other.suffix.literal.user-defined.integer.cpp
 keyword.other.suffix.literal.user-defined.reserved.character.cpp
 keyword.other.suffix.literal.user-defined.reserved.string.cpp
 keyword.other.suffix.literal.user-defined.string.cpp
@@ -163,8 +169,11 @@ meta.arguments.operator.noexcept
 meta.arguments.operator.sizeof
 meta.arguments.operator.sizeof.variadic
 meta.arguments.operator.typeid
+meta.arguments.requires
 meta.asm.cpp
+meta.assignment.cpp
 meta.banner.character.cpp
+meta.binding.cpp
 meta.block.class.cpp
 meta.block.cpp
 meta.block.enum.cpp
@@ -188,6 +197,7 @@ meta.bracket.square.access
 meta.bracket.square.array.cpp
 meta.conditional.case.cpp
 meta.conditional.switch.cpp
+meta.declaration.cpp
 meta.declaration.namespace.alias.cpp
 meta.declaration.namespace.alias.value.cpp
 meta.declaration.type.alias.cpp
@@ -219,9 +229,11 @@ meta.head.struct.cpp
 meta.head.switch.cpp
 meta.head.union.cpp
 meta.initialization.cpp
+meta.initialization.parameter.cpp
 meta.lambda.capture.cpp
 meta.parameter.cpp
 meta.parameter.initialization
+meta.parens.control.for.cpp
 meta.parens.cpp
 meta.parens.preprocessor.conditional.cpp
 meta.preprocessor.conditional
@@ -232,10 +244,9 @@ meta.preprocessor.line.cpp
 meta.preprocessor.macro.cpp
 meta.preprocessor.pragma.cpp
 meta.preprocessor.undef.cpp
-meta.qualified_type.cpp
-meta.static_assert.message.cpp
+meta.qualified-type.cpp
+meta.static-assert.message.cpp
 meta.string.quoted.double.raw.glsl.cpp
-meta.string.quoted.double.raw.sql.cpp
 meta.tail.class.cpp
 meta.tail.enum.cpp
 meta.tail.extern.cpp
@@ -252,11 +263,14 @@ meta.template.definition.cpp
 meta.template.explicit-instantiation.cpp
 meta.toc-list.banner.block.cpp
 meta.toc-list.banner.double-slash.cpp
+meta.type.cpp
 meta.using-namespace.cpp
 punctuation.accessor.attribute.cpp
+punctuation.accessor.initializer.cpp
 punctuation.cpp
 punctuation.definition.begin.bracket.square
 punctuation.definition.begin.bracket.square.array.type.cpp
+punctuation.definition.begin.bracket.square.binding.cpp
 punctuation.definition.begin.bracket.square.cpp
 punctuation.definition.capture.begin.lambda.cpp
 punctuation.definition.capture.end.lambda.cpp
@@ -269,6 +283,7 @@ punctuation.definition.comment.end.documentation.cpp
 punctuation.definition.directive.cpp
 punctuation.definition.end.bracket.square
 punctuation.definition.end.bracket.square.array.type.cpp
+punctuation.definition.end.bracket.square.binding.cpp
 punctuation.definition.end.bracket.square.cpp
 punctuation.definition.function.pointer.dereference.cpp
 punctuation.definition.function.return-type.cpp
@@ -277,10 +292,10 @@ punctuation.definition.parameters.begin.lambda.cpp
 punctuation.definition.parameters.begin.preprocessor.cpp
 punctuation.definition.parameters.end.lambda.cpp
 punctuation.definition.parameters.end.preprocessor.cpp
-punctuation.definition.string.begin
+punctuation.definition.string.$2.begin
+punctuation.definition.string.$2.end
 punctuation.definition.string.begin.assembly.cpp
 punctuation.definition.string.begin.cpp
-punctuation.definition.string.end
 punctuation.definition.string.end.assembly.cpp
 punctuation.definition.string.end.cpp
 punctuation.section.angle-brackets.begin.template.call.cpp
@@ -291,6 +306,7 @@ punctuation.section.arguments.begin.bracket.curly.initializer.cpp
 punctuation.section.arguments.begin.bracket.round.decltype.cpp
 punctuation.section.arguments.begin.bracket.round.function.call.cpp
 punctuation.section.arguments.begin.bracket.round.function.call.initializer.cpp
+punctuation.section.arguments.begin.bracket.round.function.call.upper-case.cpp
 punctuation.section.arguments.begin.bracket.round.function.member.cpp
 punctuation.section.arguments.begin.bracket.round.initializer.cpp
 punctuation.section.arguments.begin.bracket.round.operator.alignas.cpp
@@ -299,7 +315,8 @@ punctuation.section.arguments.begin.bracket.round.operator.noexcept.cpp
 punctuation.section.arguments.begin.bracket.round.operator.sizeof.cpp
 punctuation.section.arguments.begin.bracket.round.operator.sizeof.variadic.cpp
 punctuation.section.arguments.begin.bracket.round.operator.typeid.cpp
-punctuation.section.arguments.begin.bracket.round.static_assert.cpp
+punctuation.section.arguments.begin.bracket.round.requires.cpp
+punctuation.section.arguments.begin.bracket.round.static-assert.cpp
 punctuation.section.arguments.end.bracket.curly.initializer.cpp
 punctuation.section.arguments.end.bracket.round.decltype.cpp
 punctuation.section.arguments.end.bracket.round.function.call.cpp
@@ -312,7 +329,8 @@ punctuation.section.arguments.end.bracket.round.operator.noexcept.cpp
 punctuation.section.arguments.end.bracket.round.operator.sizeof.cpp
 punctuation.section.arguments.end.bracket.round.operator.sizeof.variadic.cpp
 punctuation.section.arguments.end.bracket.round.operator.typeid.cpp
-punctuation.section.arguments.end.bracket.round.static_assert.cpp
+punctuation.section.arguments.end.bracket.round.requires.cpp
+punctuation.section.arguments.end.bracket.round.static-assert.cpp
 punctuation.section.attribute.begin.cpp
 punctuation.section.attribute.end.cpp
 punctuation.section.block.begin.bracket.curly.class.cpp
@@ -402,13 +420,15 @@ punctuation.vararg-ellipses.variable.parameter.preprocessor.cpp
 storage.modifier.$1.cpp
 storage.modifier.$8.cpp
 storage.modifier.array.bracket.square
+storage.modifier.const.cpp
 storage.modifier.cpp
 storage.modifier.inline.cpp
 storage.modifier.lambda.$0.cpp
 storage.modifier.pointer.cpp
 storage.modifier.reference.cpp
 storage.modifier.specifier.$3.cpp
 storage.modifier.specifier.extern.cpp
+storage.modifier.specifier.functional.post-parameters.$10.cpp
 storage.modifier.specifier.functional.post-parameters.$5.cpp
 storage.modifier.specifier.functional.pre-parameters.$0.cpp
 storage.modifier.specifier.parameter.cpp
@@ -452,7 +472,8 @@ storage.type.union.declare.cpp
 storage.type.union.parameter.cpp
 string.quoted.double.cpp
 string.quoted.double.include.cpp
-string.quoted.double.raw
+string.quoted.double.raw.$2
+string.quoted.double.raw.cpp
 string.quoted.double.raw.regex.cpp
 string.quoted.other.lt-gt.include.cpp
 string.quoted.single.cpp
@@ -462,17 +483,43 @@ support.type.built-in.posix-reserved.cpp
 support.type.built-in.posix-reserved.pthread.cpp
 support.type.posix-reserved.cpp
 support.type.posix-reserved.pthread.cpp
+variable.camel-case.cpp
 variable.language.this.cpp
+variable.lower-case.cpp
 variable.other.asm.label.cpp
+variable.other.assignment.cpp
+variable.other.declare.cpp
 variable.other.definition.pointer.function.cpp
 variable.other.enummember.cpp
+variable.other.for.cpp
 variable.other.macro.argument.cpp
 variable.other.object
-variable.other.object.access.cpp
+variable.other.object.access.$4.cpp
+variable.other.object.access.$5.cpp
+variable.other.object.access.$6.cpp
+variable.other.object.access.$7.cpp
+variable.other.object.access.$8.cpp
+variable.other.object.access.$9.cpp
+variable.other.object.construction.cpp
 variable.other.object.declare.cpp
+variable.other.object.declare.for.cpp
 variable.other.object.property.cpp
 variable.other.property.cpp
+variable.other.unknown.$1.cpp
+variable.other.unknown.$10.cpp
+variable.other.unknown.$19.cpp
+variable.other.unknown.$2.cpp
+variable.other.unknown.$24.cpp
+variable.other.unknown.$28.cpp
+variable.other.unknown.$3.cpp
+variable.other.unknown.$4.cpp
+variable.other.unknown.$49.cpp
+variable.other.unknown.$5.cpp
+variable.other.unknown.$8.cpp
 variable.parameter.capture.cpp
 variable.parameter.cpp
+variable.parameter.initializer.cpp
 variable.parameter.pointer.function.cpp
-variable.parameter.preprocessor.cpp
+variable.parameter.preprocessor.cpp
+variable.snake-case.cpp
+variable.upper-case.cpp

commands/project/publish

@@ -2,3 +2,6 @@
 
 vsce publish --pat "$1" && echo "published on VSCE"
 ovsx publish -p "$2" && echo "published on OVSX"
+
+tag_name="$(jq '.version' ./package.json)"
+git tag "$tag_name" && git push origin "$tag_name"

commands/project/test

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+if [ -z "$FORNIX_FOLDER" ]
+then
+    FORNIX_FOLDER="."
+fi
+
 npx textmate-tester \
     --textmateExtension cpp \
     --syntax "$FORNIX_FOLDER/autogenerated/cpp.tmLanguage.json" \

commands/start

@@ -3,10 +3,62 @@
 # 
 # summary
 # 
-#     find fornix, make sure nix exists
+#     make sure nix exists
+#     find fornix
 #     with no arguments, this simply starts the shell
 #     with an argument, it refreshes the project connections, then runs `$commands_folder/project/$the_arguments`
 
+# if nix doesnt exist
+if [ -z "$(command -v "nix-shell")" ]
+then
+    echo runinng installer_helper
+    # 
+    # find the settings/extensions/nix/installer_helper
+    # 
+    path_to_installer_helper=""
+    file_name="settings/extensions/nix/installer_helper"
+    folder_to_look_in="$PWD"
+    while :
+    do
+        # check if file exists
+        if [ -f "$folder_to_look_in/$file_name" ]
+        then
+            path_to_installer_helper="$folder_to_look_in/$file_name"
+            break
+        else
+            if [ "$folder_to_look_in" = "/" ]
+            then
+                break
+            else
+                folder_to_look_in="$(dirname "$folder_to_look_in")"
+            fi
+        fi
+    done
+    # couldn't find it
+    if [ -z "$path_to_installer_helper" ]
+    then
+        #
+        # what to do if file never found
+        #
+        echo "I'm a script running with a pwd of:$PWD"
+        echo "I'm looking for $file_name in a parent folder"
+        echo "I'm exiting now because I wasnt able to find it"
+        echo "thats all the information I have"
+        exit
+    # 
+    # found it
+    # 
+    else 
+        # if wasnt able to install, then exit
+        export install_repo="false" # we only need nix
+        if ! . "$path_to_installer_helper"; then
+            # the installer will have the instructions/error messages
+            exit
+        fi
+        unset install_repo
+    fi
+fi
+
 # 
 # find the fornix_core
 # 
@@ -198,8 +250,6 @@ then
     fi
 fi
 
-. "$FORNIX_FOLDER/settings/extensions/nix/commands/ensure_nix_installed"
-
 # just start the shell with no arguments (arguments might be supported in the future)
 "$FORNIX_COMMANDS_FOLDER/shell"
 if [ "$FORNIX_DEBUG" = "true" ]; then