fixed indentation in test html file and added comma as punctuation

thesave · Oct 14, 2016 · f9dd349 · f9dd349
1 parent 456374d
commit f9dd349
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 83 deletions.
diff --git a/components/prism-jolie.js b/components/prism-jolie.js
@@ -4,7 +4,7 @@ Prism.languages.jolie = Prism.languages.extend('clike', {
 	'number': /\b\d*\.?\d+(?:e[+-]?\d+)?l?\b/i,
 	'operator': /->|<<|[!+-<>=*]?=|[:<>!?*\/%^]|&&|\|\||--?|\+\+?/g,
 	'symbol': /[|;@]/,
-	'punctuation': /\./,
+	'punctuation': /[,.]/,
 	'string': {
 		pattern: /(["'])(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
 		greedy: true
@@ -32,13 +32,19 @@ Prism.languages.insertBefore( 'jolie', 'keyword', {
 			},
 			'function': {
 				pattern: /\w+/
+			},
+			'punctuation': {
+				pattern: /,/
 			}
 		}
 	},
 	'redirects': {
 		pattern: /(\bRedirects\s*:\s*)(?:\w+\s*=>\s*\w+\s*,\s*)*(?:\w+\s*=>\s*\w+)/,
 		lookbehind: true,
 		inside: {
+			'punctuation': {
+				pattern: /,/
+			},
 			'function': {
 				pattern: /\w+/g
 			},

diff --git a/components/prism-jolie.min.js b/components/prism-jolie.min.js
diff --git a/examples/prism-jolie.html b/examples/prism-jolie.html
@@ -22,14 +22,14 @@ <h2>Full example</h2>
 <pre><code>include "console.iol"
 
 type HubType: void {
-    .sid: undefined
-    .nodes[1,*] : NodeType
+  .sid: undefined
+  .nodes[1,*] : NodeType
 }
 
 type NodeType: void {
-    .sid: string
-    .node: string
-    .load?: int
+  .sid: string
+  .node: string
+  .load?: int
 }
 
 type NetType: HubType | NodeType
@@ -40,7 +40,7 @@ <h2>Full example</h2>
 }
 
 type LogType: void {
-    .message: string
+  .message: string
 }
 
 interface LoggerInterface {
@@ -65,40 +65,40 @@ <h2>Full example</h2>
 
 service SubService 
 {
-    Interfaces: NetInterface
-    
-    main
-    {
-        println@Console( "I do nothing" )()
-    }
+  Interfaces: NetInterface
+
+  main
+  {
+     println@Console( "I do nothing" )()
+  }
 }
 
 inputPort ExtLogger {
-    Location: "socket://localhost:9000"
-    Protocol: sodep
-    Interfaces: LoggerInterface
-    Aggregates: LoggerService with AuthInterfaceExtender
+  Location: "socket://localhost:9000"
+  Protocol: sodep
+  Interfaces: LoggerInterface
+  Aggregates: LoggerService with AuthInterfaceExtender
 }
 
 courier ExtLogger {
-    [interface LoggerInterface( request )] {
-        if ( key == "secret" ){
-            forward ( request )
-        }
+  [interface LoggerInterface( request )] {
+    if ( key == "secret" ){
+      forward ( request )
     }
+  }
 }
 
 inputPort In {
-    Location: "socket://localhost:8000"
-    Protocol: http {
-        .debug = true;
-        .debug.showContent = true
-    }
-    Interfaces: NetInterface
-    Aggregates: SubService, 
-                LoggerService
-    Redirects: A => SubService, 
-               B => SubService
+  Location: "socket://localhost:8000"
+  Protocol: http {
+    .debug = true;
+    .debug.showContent = true
+  }
+  Interfaces: NetInterface
+  Aggregates: SubService, 
+              LoggerService
+  Redirects: A => SubService, 
+             B => SubService
 }
 
 cset {
@@ -108,59 +108,58 @@ <h2>Full example</h2>
 execution{ concurrent }
 
 define netmodule {
-    if( request.load == 0 || request.load < 1 && 
-            request.load <= 2 || request.load >= 3 && 
-            request.load > 4    || request.load%4 == 2
-    ) {
-        scope( scopeName )
-        {   
-            // inline comment
-            install( MyFault => println@Console( "Something \"Went\" Wrong" + ' but it\'s ok' )() );
-            /*
-            * Multi-line
-            * Comment
-            */
-            install( this => cH; println@Console( "Something went wrong: " + ^load )() );
-            install( default => comp( scopeName ); println@Console( "Something went wrong" )() );
-                load -> request.( "load" );
-                { ++load | load++ | --load | load-- };
-                throw( MyFault )
-        }
-    } else {
-    foreach ( node -> request.nodes ) {
-        with( node ){
-            while( .load != 100 ) {
-                    .load++
-                }   
-            }
-        }
+  if( request.load == 0 || request.load < 1 && 
+      request.load <= 2 || request.load >= 3 && 
+      request.load > 4  || request.load%4 == 2
+  ) {
+    scope( scopeName ) {   
+      // inline comment
+      install( MyFault => println@Console( "Something \"Went\" Wrong" + ' but it\'s ok' )() );
+      /*
+      * Multi-line
+      * Comment
+      */
+      install( this => cH; println@Console( "Something went wrong: " + ^load )() );
+      install( default => comp( scopeName ); println@Console( "Something went wrong" )() );
+      load -> request.( "load" );
+      { ++load | load++ | --load | load-- };
+      throw( MyFault )
     }
+  } else {
+    foreach ( node -> request.nodes ) {
+      with( node ){
+        while( .load != 100 ) {
+          .load++
+        }   
+      }
+    } 
+  }
 }
 
 main
 {
-    start( sid );
-    synchronized( unneededSync ){
-        csets.sid = sid;
-        undef( sid )
-    };
-    provide
-        [ addElement( request ) ]{
-            if( request instanceof NodeType ) {
-                netmodule
-            }
-        }
-        [ removeElement() ]
-        [ showElements()( response ){
-            /*
-            * assemble response
-            */
-            nullProcess
-        }]{
-            // log the request
-            log@LoggerService( new )();
-            log @ LoggerService( new )()
+  start( sid );
+  synchronized( unneededSync ){
+    csets.sid = sid;
+    undef( sid )
+  };
+  provide
+    [ addElement( request ) ]{
+      if( request instanceof NodeType ) {
+        netmodule
+      }
     }
-    until
-        [ quit() ]{ exit }
+    [ removeElement() ]
+    [ showElements()( response ){
+       /*
+       * assemble response
+       */
+       nullProcess
+     }]{
+       // log the request
+       log@LoggerService( new )();
+       log @ LoggerService( new )()
+     }
+  until
+   [ quit() ]{ exit }
 }</code></pre>
diff --git a/tests/languages/jolie/deployment_features.test b/tests/languages/jolie/deployment_features.test
@@ -8,7 +8,7 @@ println @ Console( "none" )()
  [ "keyword", "Aggregates" ],
  [ "operator", ":" ],
  [ "aggregates", [
-	[ "function", "First" ], ", ",
+	[ "function", "First" ], [ "punctuation", ","],
  	[ "function", "Second" ],
  	[ "withExtension", [
 		[ "keyword", "with" ], " Third" ]
@@ -21,7 +21,7 @@ println @ Console( "none" )()
   [
    [ "function", "First" ],
    [ "symbol", "=>" ],
-   [ "function", "Second" ], ", ",
+   [ "function", "Second" ], [ "punctuation", ","],
    [ "function", "Third" ],
    [ "symbol", "=>" ],
    [ "function", "Fourth" ]