fix: Add C++ Source files to the Sources group

They were wrongly being added to Resources.

Author: mbektchiev

lib/pbxFile.js

@@ -22,7 +22,9 @@ var DEFAULT_SOURCETREE = '"<group>"',
     DEFAULT_PRODUCT_SOURCETREE = 'BUILT_PRODUCTS_DIR',
     DEFAULT_FILEENCODING = 4,
     DEFAULT_GROUP = 'Resources',
-    DEFAULT_FILETYPE = 'unknown';
+    DEFAULT_FILETYPE = 'unknown',
+    HEADER_FILE_TYPE_SUFFIX = ".h",
+    SOURCE_CODE_FILE_TYPE_PREFIX = "sourcecode.";
 
 var FILETYPE_BY_EXTENSION = {
         a: 'archive.ar',
@@ -99,6 +101,13 @@ var FILETYPE_BY_EXTENSION = {
         'text.plist.strings': 4
     };
 
+function isSourceOrHeaderFileType(fileType) {
+    return fileType.startsWith(SOURCE_CODE_FILE_TYPE_PREFIX);
+}
+
+function isHeaderFileType(fileType) {
+    return fileType.endsWith(HEADER_FILE_TYPE_SUFFIX);
+}
 
 function unquoted(text){
     return text == null ? '' : text.replace (/(^")|("$)/g, '')
@@ -250,5 +259,6 @@ function pbxFile(filepath, opt) {
 
 module.exports = {
     pbxFile: pbxFile,
-    fileTypes: fileTypes
+    isSourceOrHeaderFileType,
+    isHeaderFileType
 }

lib/pbxProject.js

@@ -23,14 +23,13 @@ var util = require('util'),
     fork = require('child_process').fork,
     pbxWriter = require('./pbxWriter'),
     pbxFile = require('./pbxFile').pbxFile,
-    pbxFileTypes = require('./pbxFile').fileTypes,
+    isSourceOrHeaderFileType = require('./pbxFile').isSourceOrHeaderFileType,
+    isHeaderFileType = require('./pbxFile').isHeaderFileType,
     fs = require('fs'),
     parser = require('./parser/pbxproj'),
     plist = require('simple-plist'),
     COMMENT_KEY = /_comment$/,
-    NO_SPECIAL_SYMBOLS = /^[a-zA-Z0-9_\.\$]+\.[a-zA-Z]+$/,
-    HEADER_FILE_TYPE_SUFFIX = ".h",
-    SOURCE_CODE_FILE_TYPE_PREFIX = "sourcecode.";
+    NO_SPECIAL_SYMBOLS = /^[a-zA-Z0-9_\.\$]+\.[a-zA-Z]+$/;
 
 function pbxProject(filename) {
     if (!(this instanceof pbxProject))
@@ -560,12 +559,12 @@ pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceT
             pbxGroup.children.push(pbxGroupChild(file));
             var files = fs.readdirSync(filePath).map(p => $path.join(filePath, p));
             this.addPbxGroup(files, $path.basename(filePath), filePath, null, {uuid: file.uuid});
-        }else if (file.lastType.startsWith(SOURCE_CODE_FILE_TYPE_PREFIX)) {
+        }else if (isSourceOrHeaderFileType(file.lastType)) {
             file.uuid = this.generateUuid();
             file.fileRef = this.generateUuid();
             this.addToPbxFileReferenceSection(file);    // PBXFileReference
             this.addToPbxBuildFileSection(file);        // PBXBuildFile
-            if (!file.lastType.endsWith(HEADER_FILE_TYPE_SUFFIX)) {
+            if (!isHeaderFileType(file.lastType)) {
                 this.addToPbxSourcesBuildPhase(file);
             }
             pbxGroup.children.push(pbxGroupChild(file));
@@ -1605,11 +1604,11 @@ function pbxFileReferenceObj(file) {
         fileObject.name = fileObject.name.replace(/\"/g, "\\\"");
         fileObject.path = fileObject.path.replace(/\"/g, "\\\"");
     }
-    
+
     if(!file.basename.match(NO_SPECIAL_SYMBOLS)) {
         fileObject.name = "\"" + fileObject.name + "\"";
     }
-    
+
     if(!file.path.match(NO_SPECIAL_SYMBOLS)) {
         fileObject.path = "\"" + fileObject.path + "\"";
     }