Merge pull request #1702 from ellemenno/loomscript-support

add language declaration and samples for LoomScript

grammars.yml

@@ -61,6 +61,8 @@ https://github.com/Varriount/NimLime:
 - source.nimrod
 - source.nimrod_filter
 - source.nimrodcfg
+https://github.com/ambethia/Sublime-Loom:
+- source.loomscript
 https://github.com/angryant0007/VBDotNetSyntax:
 - source.vbnet
 https://github.com/anunayk/cool-tmbundle:

lib/linguist/heuristics.rb

@@ -146,6 +146,15 @@ module Linguist
 
     disambiguate "Gosu", "JavaScript" do |data|
       Language["Gosu"] if /^uses java\./.match(data)
-    end    
+    end
+
+    disambiguate "LoomScript", "LiveScript" do |data|
+      if /^\s*package\s*[\w\.\/\*\s]*\s*{/.match(data)
+        Language["LoomScript"]
+      else
+        Language["LiveScript"]
+      end
+    end
+
   end
 end

lib/linguist/languages.yml

@@ -1492,6 +1492,12 @@ LookML:
   - .lookml
   tm_scope: source.yaml
 
+LoomScript:
+  type: programming
+  extensions:
+  - .ls
+  tm_scope: source.loomscript
+
 Lua:
   type: programming
   ace_mode: lua

samples/LoomScript/HelloWorld.ls

@@ -0,0 +1,38 @@
+package
+{
+    import loom.Application;
+    import loom2d.display.StageScaleMode;
+    import loom2d.ui.SimpleLabel;
+
+    /**
+    The HelloWorld app renders a label with its name on it,
+    and traces 'hello' to the log.
+    */
+    public class HelloWorld extends Application
+    {
+
+        override public function run():void
+        {
+            stage.scaleMode = StageScaleMode.LETTERBOX;
+            centeredMessage(simpleLabel, this.getFullTypeName());
+
+            trace("hello");
+        }
+
+        // a convenience getter that generates a label and adds it to the stage
+        private function get simpleLabel():SimpleLabel
+        {
+            return stage.addChild(new SimpleLabel("assets/Curse-hd.fnt")) as SimpleLabel;
+        }
+
+        // a utility to set the label's text and then center it on the stage
+        private function centeredMessage(label:SimpleLabel, msg:String):void
+        {
+            label.text = msg;
+            label.center();
+            label.x = stage.stageWidth / 2;
+            label.y = (stage.stageHeight / 2) - (label.height / 2);
+        }
+
+    }
+}

samples/LoomScript/SyntaxExercise.ls

@@ -0,0 +1,137 @@
+package
+{
+    import loom.Application;
+
+    public interface I {}
+    public class C {}
+    public class B extends C implements I {}
+    final public class A extends B {}
+
+    delegate ToCompute(s:String, o:Object):Number;
+
+    public enum Enumeration
+    {
+      foo,
+      baz,
+      cat,
+    }
+
+    struct P {
+        public var x:Number = 0;
+        public var y:Number = 0;
+        public static operator function =(a:P, b:P):P
+        {
+            a.x = b.x;
+            a.y = b.y;
+
+            return a;
+        }
+    }
+
+    // single-line comment
+
+    /*
+    Multi-line comment
+    */
+
+    /**
+    Doc comment
+    */
+    public class SyntaxExercise extends Application
+    {
+        static public var classVar:String = 'class variable';
+        public const CONST:String = 'constant';
+        private var _a:A = new A();
+        public var _d:ToCompute;
+
+        override public function run():void
+        {
+            trace("hello");
+        }
+
+        private function get a():A { return _a; }
+        private function set a(value:A):void { _a = value; }
+
+        private function variousTypes(defaultValue:String = ''):void
+        {
+            var nil:Object = null;
+            var b1:Boolean = true;
+            var b2:Boolean = false;
+            var n1:Number = 0.123;
+            var n2:Number = 12345;
+            var n3:Number = 0xfed;
+            var s1:String = 'single-quotes with "quotes" inside';
+            var s2:String = "double-quotes with 'quotes' inside";
+            var f1:Function = function (life:String, universe:Object, ...everything):Number { return 42; };
+            var v1:Vector.<Number> = [1, 2];
+            var d1:Dictionary.<String, Number> = { 'three': 3, 'four': 4 };
+
+            _d += f1;
+            _d -= f1;
+        }
+
+        private function variousOps():void
+        {
+            var a = ((100 + 200 - 0) / 300) % 2;
+            var b = 100 * 30;
+            var d = true && (b > 301);
+            var e = 0x10 | 0x01;
+
+            b++; b--;
+            a += 300; a -= 5; a *= 4; a /= 2; a %= 7;
+
+            var castable1:Boolean = (a is B);
+            var castable2:Boolean = (a as B) != null;
+            var cast:String = B(a).toString();
+            var instanced:Boolean = (_a instanceof A);
+        }
+
+        private function variousFlow():void
+        {
+            var n:Number = Math.random();
+            if (n > 0.6)
+                trace('top 40!');
+            else if(n > 0.3)
+                trace('mid 30!');
+            else
+                trace('bottom 30');
+
+            var flip:String =  (Math.random() > 0.5) ? 'heads' : 'tails';
+
+            for (var i = 0; i < 100; i++)
+                trace(i);
+
+            var v:Vector.<String> = ['a', 'b', 'c'];
+            for each (var s:String in v)
+                trace(s);
+
+            var d:Dictionary.<String, Number> = { 'one': 1 };
+            for (var key1:String in d)
+                trace(key1);
+
+            for (var key2:Number in v)
+                trace(key2);
+
+            while (i > 0)
+            {
+                i--;
+                if (i == 13) continue;
+                trace(i);
+            }
+
+            do
+            {
+                i++;
+            }
+            while (i < 10);
+
+            switch (Math.floor(Math.random()) * 3 + 1)
+            {
+                case 1 : trace('rock'); break;
+                case 2 : trace('paper'); break;
+                default: trace('scissors'); break;
+            }
+        }
+
+    }
+}

test/test_heuristics.rb

@@ -122,4 +122,11 @@ class TestHeuristcs < Test::Unit::TestCase
       end
     end
   end
+
+  def test_ls_by_heuristics
+    assert_heuristics({
+      "LiveScript" => "LiveScript/hello.ls",
+      "LoomScript" => "LoomScript/HelloWorld.ls"
+    })
+  end
 end