Updated version and headers

Formatter/CliFormatter.php

@@ -2,13 +2,13 @@
 /**
  * Highlighter
  *
- * Copyright (C) 2015, Some right reserved.
+ * Copyright (C) 2016, Some right reserved.
  *
- * @author Kacper "Kadet" Donat <[email protected]>
+ * @author Kacper "Kadet" Donat <[email protected]>
  *
  * Contact with author:
- * Xmpp: [email protected]
- * E-mail: [email protected]
+ * Xmpp: [email protected]
+ * E-mail: [email protected]
  *
  * From Kadet with love.
  */

Formatter/DebugFormatter.php

@@ -2,13 +2,13 @@
 /**
  * Highlighter
  *
- * Copyright (C) 2015, Some right reserved.
+ * Copyright (C) 2016, Some right reserved.
  *
- * @author Kacper "Kadet" Donat <[email protected]>
+ * @author Kacper "Kadet" Donat <[email protected]>
  *
  * Contact with author:
- * Xmpp: [email protected]
- * E-mail: [email protected]
+ * Xmpp: [email protected]
+ * E-mail: [email protected]
  *
  * From Kadet with love.
  */

Formatter/FormatterInterface.php

@@ -2,13 +2,13 @@
 /**
  * Highlighter
  *
- * Copyright (C) 2015, Some right reserved.
+ * Copyright (C) 2016, Some right reserved.
  *
- * @author Kacper "Kadet" Donat <[email protected]>
+ * @author Kacper "Kadet" Donat <[email protected]>
  *
  * Contact with author:
- * Xmpp: [email protected]
- * E-mail: [email protected]
+ * Xmpp: [email protected]
+ * E-mail: [email protected]
  *
  * From Kadet with love.
  */

Formatter/HtmlFormatter.php

@@ -2,13 +2,13 @@
 /**
  * Highlighter
  *
- * Copyright (C) 2015, Some right reserved.
+ * Copyright (C) 2016, Some right reserved.
  *
- * @author Kacper "Kadet" Donat <[email protected]>
+ * @author Kacper "Kadet" Donat <[email protected]>
  *
  * Contact with author:
- * Xmpp: [email protected]
- * E-mail: [email protected]
+ * Xmpp:   [email protected]
+ * E-mail: [email protected]
  *
  * From Kadet with love.
  */
@@ -25,7 +25,6 @@
  */
 class HtmlFormatter implements FormatterInterface
 {
-
     public function format(Tokens $tokens)
     {
         $source = $tokens->getSource();

KeyLighter.php

@@ -2,13 +2,13 @@
 /**
  * Highlighter
  *
- * Copyright (C) 2015, Some right reserved.
+ * Copyright (C) 2016, Some right reserved.
  *
- * @author Kacper "Kadet" Donat <[email protected]>
+ * @author Kacper "Kadet" Donat <[email protected]>
  *
  * Contact with author:
- * Xmpp: [email protected]
- * E-mail: [email protected]
+ * Xmpp: [email protected]
+ * E-mail: [email protected]
  *
  * From Kadet with love.
  */
@@ -30,7 +30,7 @@ class KeyLighter
 {
     use Singleton;
 
-    const VERSION = '0.2.0';
+    const VERSION = '0.7.0';
 
     /**
      * Registered aliases

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Kadet
+Copyright (C) 2016 Kadet
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Language/Css.php

@@ -113,7 +113,7 @@ public function setupRules()
                 'context' => $this->everywhere()
             ]),
 
-            'operator.punctuation' => new Rule(new SubStringMatcher(';', ['separated' => false]), [
+            'operator.punctuation' => new Rule(new SubStringMatcher(';'), [
                 'context' => $this->everywhere()
             ]),
 

Language/Css/Sass.php

@@ -32,10 +32,8 @@ public function setupRules()
     {
         parent::setupRules();
 
-        $this->rules->remove('meta.selector');
         $this->rules->remove('meta.declaration');
         $this->rules->remove('meta.declaration.media');
-        $this->rules->remove('meta.selector.tag');
 
         $this->rules->add('meta.selector', new Rule(new RegexMatcher('/(?=(?:\n+|^)(\h*)([^\h].*)\n+\1\h+)/', [
             2 => Token::NAME
@@ -51,16 +49,17 @@ public function setupRules()
             'factory'  => new TokenFactory(MetaToken::class)
         ]));
 
-        $this->rules->add('meta.declaration.media', new Rule(new RegexMatcher('/@media(.*?)/'), [
+        $this->rules->add('meta.declaration.media', new Rule(new RegexMatcher('/@media(.*?)\n/'), [
             'context' => Validator::everywhere(),
             'factory' => new TokenFactory(MetaToken::class)
         ]));
 
-        $this->rules->add('symbol.selector.tag', new Rule(new RegexMatcher('/([\w-]+)/'), [
+        $this->rules->add('symbol.selector.tag', new Rule(new RegexMatcher('/\b([a-z-][\w-]*)/'), [
             'context' => ['meta.selector', '!symbol', '!meta.declaration.media'],
         ]));
 
         $this->rules->rule('symbol.selector.class')->setContext(['meta.selector']);
+        $this->rules->rule('keyword.at-rule')->setContext(['meta.selector']);
         $this->rules->rule('symbol.selector.class.pseudo')->setContext(['meta.selector']);
         $this->rules->rule('symbol.selector.id')->setContext(['meta.selector']);
     }

Language/Ini.php

@@ -2,13 +2,13 @@
 /**
  * Highlighter
  *
- * Copyright (C) 2015, Some right reserved.
+ * Copyright (C) 2016, Some right reserved.
  *
- * @author Kacper "Kadet" Donat <[email protected]>
+ * @author Kacper "Kadet" Donat <[email protected]>
  *
  * Contact with author:
- * Xmpp: [email protected]
- * E-mail: [email protected]
+ * Xmpp: [email protected]
+ * E-mail: [email protected]
  *
  * From Kadet with love.
  */
@@ -28,7 +28,7 @@ public function setupRules()
     {
         $this->rules->addMany([
             'comment'        => new Rule(new CommentMatcher([';'], [])),
-            'symbol.section' => new Rule(new RegexMatcher('/(\[[\.\w]+\])/i')),
+            'symbol.section' => new Rule(new RegexMatcher('/(\[.*?])/i')),
             'variable'       => new Rule(new RegexMatcher('/([\.\w]+)\s*=/i')),
             'number'         => new Rule(new RegexMatcher('/(-?\d+)/i')),
 

Language/JavaScript.php

@@ -2,12 +2,12 @@
 /**
  * Highlighter
  *
- * Copyright (C) 2015, Some right reserved.
- * @author Kacper "Kadet" Donat <[email protected]>
+ * Copyright (C) 2016, Some right reserved.
+ * @author Kacper "Kadet" Donat <[email protected]>
  *
  * Contact with author:
- * Xmpp: [email protected]
- * E-mail: [email protected]
+ * Xmpp: [email protected]
+ * E-mail: [email protected]
  *
  * From Kadet with love.
  */

Language/Language.php

@@ -2,13 +2,13 @@
 /**
  * Highlighter
  *
- * Copyright (C) 2015, Some right reserved.
+ * Copyright (C) 2016, Some right reserved.
  *
- * @author Kacper "Kadet" Donat <[email protected]>
+ * @author Kacper "Kadet" Donat <[email protected]>
  *
  * Contact with author:
- * Xmpp: [email protected]
- * E-mail: [email protected]
+ * Xmpp: [email protected]
+ * E-mail: [email protected]
  *
  * From Kadet with love.
  */

Language/Php.php

@@ -2,12 +2,12 @@
 /**
  * Highlighter
  *
- * Copyright (C) 2015, Some right reserved.
- * @author Kacper "Kadet" Donat <[email protected]>
+ * Copyright (C) 2016, Some right reserved.
+ * @author Kacper "Kadet" Donat <[email protected]>
  *
  * Contact with author:
- * Xmpp: [email protected]
- * E-mail: [email protected]
+ * Xmpp: [email protected]
+ * E-mail: [email protected]
  *
  * From Kadet with love.
  */
@@ -69,9 +69,15 @@ public function setupRules()
                 ]),
             ],
 
-            'symbol.namespace' => new Rule(new RegexMatcher('/(\\\{0,2}(?:\w+\\\{1,2})+\w+)/i'), [
-                'context' => ['*symbol', '*none']
-            ]),
+            'symbol.namespace' => [
+                /*new Rule(new RegexMatcher('/(\\\{0,2}(?:\w+\\\{1,2})+)\w+/i'), [
+                    'context' => ['*symbol', '*none']
+                ]),*/
+
+                new Rule(new RegexMatcher('/namespace\s*(\\\{0,2}(?:\w+\\\{1,2})+\w+);/i'), [
+                    'context' => ['*symbol', '*none']
+                ]),
+            ],
 
             'keyword.escape' => new Rule(new RegexMatcher('/(\\\(?:x[0-9a-fA-F]{1,2}|u\{[0-9a-fA-F]{1,6}\}|[0-7]{1,3}|.))/i'), [
                 'context' => ['string']

Language/PlainText.php

@@ -2,13 +2,13 @@
 /**
  * Highlighter
  *
- * Copyright (C) 2015, Some right reserved.
+ * Copyright (C) 2016, Some right reserved.
  *
- * @author Kacper "Kadet" Donat <[email protected]>
+ * @author Kacper "Kadet" Donat <[email protected]>
  *
  * Contact with author:
- * Xmpp: [email protected]
- * E-mail: [email protected]
+ * Xmpp: [email protected]
+ * E-mail: [email protected]
  *
  * From Kadet with love.
  */

Language/PowerShell.php

@@ -2,13 +2,13 @@
 /**
  * Highlighter
  *
- * Copyright (C) 2015, Some right reserved.
+ * Copyright (C) 2016, Some right reserved.
  *
- * @author Kacper "Kadet" Donat <[email protected]>
+ * @author Kacper "Kadet" Donat <[email protected]>
  *
  * Contact with author:
- * Xmpp: [email protected]
- * E-mail: [email protected]
+ * Xmpp: [email protected]
+ * E-mail: [email protected]
  *
  * From Kadet with love.
  */

Language/Sql.php

@@ -71,10 +71,10 @@ public function setupRules()
             'comment' => new Rule(new CommentMatcher(['#', '--'], [['/*', '*/']])),
 
             'string' => [
-                new Rule(new SubStringMatcher('\''), [
+                'single' => new Rule(new SubStringMatcher('\''), [
                     'factory' => new TokenFactory(ContextualToken::class)
                 ]),
-                new Rule(new SubStringMatcher('"'), [
+                'double' => new Rule(new SubStringMatcher('"'), [
                     'factory' => new TokenFactory(ContextualToken::class)
                 ]),
             ],

Language/Xml.php

@@ -2,12 +2,12 @@
 /**
  * Highlighter
  *1
- * Copyright (C) 2015, Some right reserved.
- * @author Kacper "Kadet" Donat <[email protected]>
+ * Copyright (C) 2016, Some right reserved.
+ * @author Kacper "Kadet" Donat <[email protected]>
  *
  * Contact with author:
- * Xmpp: [email protected]
- * E-mail: [email protected]
+ * Xmpp: [email protected]
+ * E-mail: [email protected]
  *
  * From Kadet with love.
  */

Matcher/CommentMatcher.php

@@ -2,13 +2,13 @@
 /**
  * Highlighter
  *
- * Copyright (C) 2015, Some right reserved.
+ * Copyright (C) 2016, Some right reserved.
  *
- * @author Kacper "Kadet" Donat <[email protected]>
+ * @author Kacper "Kadet" Donat <[email protected]>
  *
  * Contact with author:
- * Xmpp: [email protected]
- * E-mail: [email protected]
+ * Xmpp: [email protected]
+ * E-mail: [email protected]
  *
  * From Kadet with love.
  */

Matcher/MatcherInterface.php

@@ -2,13 +2,13 @@
 /**
  * Highlighter
  *
- * Copyright (C) 2015, Some right reserved.
+ * Copyright (C) 2016, Some right reserved.
  *
- * @author Kacper "Kadet" Donat <[email protected]>
+ * @author Kacper "Kadet" Donat <[email protected]>
  *
  * Contact with author:
- * Xmpp: [email protected]
- * E-mail: [email protected]
+ * Xmpp: [email protected]
+ * E-mail: [email protected]
  *
  * From Kadet with love.
  */

Matcher/RegexMatcher.php

@@ -2,13 +2,13 @@
 /**
  * Highlighter
  *
- * Copyright (C) 2015, Some right reserved.
+ * Copyright (C) 2016, Some right reserved.
  *
- * @author Kacper "Kadet" Donat <[email protected]>
+ * @author Kacper "Kadet" Donat <[email protected]>
  *
  * Contact with author:
- * Xmpp: [email protected]
- * E-mail: [email protected]
+ * Xmpp: [email protected]
+ * E-mail: [email protected]
  *
  * From Kadet with love.
  */

Matcher/SubStringMatcher.php

@@ -2,13 +2,13 @@
 /**
  * Highlighter
  *1
- * Copyright (C) 2015, Some right reserved.
+ * Copyright (C) 2016, Some right reserved.
  *
- * @author Kacper "Kadet" Donat <[email protected]>
+ * @author Kacper "Kadet" Donat <[email protected]>
  *
  * Contact with author:
- * Xmpp: [email protected]
- * E-mail: [email protected]
+ * Xmpp: [email protected]
+ * E-mail: [email protected]
  *
  * From Kadet with love.
  */