Merge branch 'feature/format-string-tokens'

lvsti · Jun 17, 2017 · f902f27 · f902f27
2 parents 6d26715 + 9450139
commit f902f27
Show file tree

Hide file tree

Showing 10 changed files with 494 additions and 83 deletions.
diff --git a/Ilion.xcodeproj/project.pbxproj b/Ilion.xcodeproj/project.pbxproj
@@ -24,6 +24,9 @@
 		E8802A271EAE8472005DFAF0 /* String+RelativePath.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8802A261EAE8472005DFAF0 /* String+RelativePath.swift */; };
 		E8AA66DE1EB638A100903163 /* FormatDescriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8AA66DD1EB638A100903163 /* FormatDescriptor.swift */; };
 		E8B027D01EC1198B0006CA51 /* LocalizedFormat.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8B027CF1EC1198B0006CA51 /* LocalizedFormat.swift */; };
+		E8B46F091EF5986D00A9C6F5 /* TokenCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8B46F081EF5986D00A9C6F5 /* TokenCell.swift */; };
+		E8B46F0B1EF5A1C500A9C6F5 /* FileWrapper+Payload.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8B46F0A1EF5A1C500A9C6F5 /* FileWrapper+Payload.swift */; };
+		E8B46F0D1EF5A46500A9C6F5 /* NSAttributedString+TokenMarkup.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8B46F0C1EF5A46500A9C6F5 /* NSAttributedString+TokenMarkup.swift */; };
 		E8DCAA241ECF8E8E007F8915 /* StringsFileParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8DCAA231ECF8E8E007F8915 /* StringsFileParser.swift */; };
 		E8DCAA261ECF96C7007F8915 /* ExportUIFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8DCAA251ECF96C7007F8915 /* ExportUIFlow.swift */; };
 /* End PBXBuildFile section */
@@ -48,6 +51,9 @@
 		E8802A261EAE8472005DFAF0 /* String+RelativePath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+RelativePath.swift"; sourceTree = "<group>"; };
 		E8AA66DD1EB638A100903163 /* FormatDescriptor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FormatDescriptor.swift; sourceTree = "<group>"; };
 		E8B027CF1EC1198B0006CA51 /* LocalizedFormat.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocalizedFormat.swift; sourceTree = "<group>"; };
+		E8B46F081EF5986D00A9C6F5 /* TokenCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokenCell.swift; sourceTree = "<group>"; };
+		E8B46F0A1EF5A1C500A9C6F5 /* FileWrapper+Payload.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "FileWrapper+Payload.swift"; sourceTree = "<group>"; };
+		E8B46F0C1EF5A46500A9C6F5 /* NSAttributedString+TokenMarkup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSAttributedString+TokenMarkup.swift"; sourceTree = "<group>"; };
 		E8DCAA231ECF8E8E007F8915 /* StringsFileParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringsFileParser.swift; sourceTree = "<group>"; };
 		E8DCAA251ECF96C7007F8915 /* ExportUIFlow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExportUIFlow.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -89,6 +95,7 @@
 				E85387D41EA6AF9B003184B4 /* EditPanelController.swift */,
 				E81AE5CA1EC74F2D0034EF07 /* EditPanelViewModel.swift */,
 				E8DCAA251ECF96C7007F8915 /* ExportUIFlow.swift */,
+				E8B46F0A1EF5A1C500A9C6F5 /* FileWrapper+Payload.swift */,
 				E8AA66DD1EB638A100903163 /* FormatDescriptor.swift */,
 				E8136A821EA8042E003D9877 /* Ilion-Private-Swift.h */,
 				E85387C81EA6AC12003184B4 /* Ilion.h */,
@@ -97,11 +104,13 @@
 				E85387C91EA6AC12003184B4 /* Info.plist */,
 				E8B027CF1EC1198B0006CA51 /* LocalizedFormat.swift */,
 				E84EA94A1EB3BB38001C6856 /* LocKeyPath.swift */,
+				E8B46F0C1EF5A46500A9C6F5 /* NSAttributedString+TokenMarkup.swift */,
 				E8136A691EA7E155003D9877 /* NSBundle+Ilion.m */,
 				E81AE5C61EC4FED30034EF07 /* String+Length.swift */,
 				E8802A261EAE8472005DFAF0 /* String+RelativePath.swift */,
 				E8DCAA231ECF8E8E007F8915 /* StringsFileParser.swift */,
 				E85387D11EA6AD2E003184B4 /* StringsManager.swift */,
+				E8B46F081EF5986D00A9C6F5 /* TokenCell.swift */,
 			);
 			path = Ilion;
 			sourceTree = "<group>";
@@ -200,8 +209,11 @@
 				E85387D61EA6AF9B003184B4 /* EditPanelController.swift in Sources */,
 				E8802A251EAE73B5005DFAF0 /* Dictionary+Fmap.swift in Sources */,
 				E85387DA1EA6B080003184B4 /* BrowserWindowController.swift in Sources */,
+				E8B46F091EF5986D00A9C6F5 /* TokenCell.swift in Sources */,
+				E8B46F0D1EF5A46500A9C6F5 /* NSAttributedString+TokenMarkup.swift in Sources */,
 				E8DCAA261ECF96C7007F8915 /* ExportUIFlow.swift in Sources */,
 				E85387D21EA6AD2E003184B4 /* StringsManager.swift in Sources */,
+				E8B46F0B1EF5A1C500A9C6F5 /* FileWrapper+Payload.swift in Sources */,
 				E81AE5C71EC4FED30034EF07 /* String+Length.swift in Sources */,
 				E84EA94B1EB3BB38001C6856 /* LocKeyPath.swift in Sources */,
 			);