Merge branch 'dev'

Author: Max Schmidt

lib/snippet-injector.js

@@ -36,6 +36,7 @@ export default {
 
   create() {
     var selection = atom.workspace.getActiveTextEditor().getSelectedText();
+    var grammar = atom.workspace.getActiveTextEditor().getGrammar();
     var storage = this.storage;
     const inputPrompt = Util.promptUser({
       placeholder: 'Enter snippet title',
@@ -46,7 +47,8 @@ export default {
         var result = storage.store(new Snippet({
           title: text,
           tags: new Array(),
-          content: selection
+          content: selection,
+          lang: grammar
         }));
         if(result) {
           atom.notifications.addSuccess('Snippet "'+text+'" was saved successfully.', null);

lib/snippet.js

@@ -5,16 +5,19 @@ export default class Snippet {
   content = '';
   title = '';
   tags = new Array();
+  lang = '';
 
   constructor(state) {
     if(state !== undefined && state !== null && typeof state === 'object') {
       this.title = state.title;
       this.tags = state.tags;
       this.content = state.content;
+      this.lang = state.lang;
     } else {
       this.title = "";
       this.tags = new Array();
       this.content = "";
+      tis.lang = "";
     }
   }
 
@@ -23,14 +26,15 @@ export default class Snippet {
     return {
       'title':this.title,
       'tags':this.tags,
-      'content':this.content
+      'content':this.content,
+      'lang':this.lang
     };
   }
 
   // Tear down any state and detach
   destroy() {}
 
-  
+
   getTitle() {
     return this.title;
   }
@@ -43,4 +47,7 @@ export default class Snippet {
     return this.tags;
   }
 
+  getLang() {
+    return this.lang;
+  }
 }

lib/storage.js

@@ -28,12 +28,19 @@ export default class Storage {
   destroy() {}
 
   init(directory) {
-    this.dir = directory;
-    try {
-      fs.statSync(this.storageDir+this.dir);
-    } catch(e) {
-      fs.mkdirSync(this.storageDir+this.dir);
-    }
+    var temp = '\\';
+    var store = this.storageDir;
+    directory.split('/').join('\\').split('\\').forEach(function(currentValue,index) {
+      if(currentValue !== "" && currentValue !== " " && currentValue !== null && currentValue !== undefined) {
+        temp += currentValue+'\\';
+        try {
+          fs.statSync(store+temp);
+        } catch(e) {
+          fs.mkdirSync(store+temp);
+        }
+      }
+    });
+    this.dir = temp;
   }
 
   store(snippet) {