Merge branch 'develop' of https://github.com/subethaedit/SubEthaEdit into feature/1-project-context

Author: fourplusone

Artwork-Sources/Symbols.afdesign

@@ -184,11 +184,6 @@ - (instancetype)init {
     return self;
 }
 
-- (void)dealloc {
-	self.changedScopeNameDict = nil;
-    self.allPathExtensions = nil;
-}
-
 #pragma mark - Directories
 
 #define BUNDLE_MODE_FOLDER_NAME @"Modes"

SubEthaEdit-Mac/Source/DocumentModeManager.m

@@ -79,10 +79,6 @@ - (instancetype)initWithSession:(TCMMMSession *)aSession {
     return self;
 }
 
-- (void)dealloc {
-    [[self window] setDelegate:nil];
-}
-
 - (void)update {
     TCMMMSessionClientState state=[[(PlainTextDocument *)[self document] session] clientState];
     if (state == TCMMMSessionClientJoiningState) {

SubEthaEdit-Mac/Source/DocumentProxyWindowController.m

@@ -23,30 +23,7 @@ extern NSString * const TextStorageHasMixedLineEndingsDidChange;
 extern NSString * const BlockeditAttributeName ;
 extern NSString * const BlockeditAttributeValue;
 
-@interface FoldableTextStorage : AbstractFoldingTextStorage {
-	FullTextStorage *I_fullTextStorage;
-	NSMutableArray *I_sortedFoldedTextAttachments;
-    NSMutableAttributedString *I_internalAttributedString;
-
-	int I_editingCount;
-
-    struct {
-        BOOL hasBlockeditRanges;
-        BOOL  isBlockediting;
-        BOOL didBlockedit;
-        NSRange didBlockeditRange;
-        NSRange didBlockeditLineRange;
-    } I_blockedit;
-
-
-    struct {
-        int length;
-        int characterOffset;
-        int startLine;
-        int endLine;
-    } I_scriptingProperties;
-    
-}
+@interface FoldableTextStorage : AbstractFoldingTextStorage 
 
 - (NSRange)foldedRangeForFullRange:(NSRange)inRange;
 - (NSRange)foldedRangeForFullRange:(NSRange)inRange expandIfFolded:(BOOL)aFlag;
@@ -73,7 +50,6 @@ extern NSString * const BlockeditAttributeValue;
 - (void)foldAccordingToDataRepresentation:(NSData *)aData;
 - (NSData *)dataRepresentationOfFoldedRangesWithMaxDepth:(int)aMaxDepth;
 
-
 #pragma mark line numbers
 - (int)lineNumberForLocation:(unsigned)location;
 - (NSString *)positionStringForRange:(NSRange)aRange;
@@ -93,7 +69,6 @@ extern NSString * const BlockeditAttributeValue;
 
 - (void)stopBlockedit;
 
-
 #pragma mark debug output
 - (NSMutableAttributedString *)attributedStringOfFolding:(FoldedTextAttachment *)inAttachment;
 - (NSString *)foldedStringRepresentationOfRange:(NSRange)inRange foldings:(NSArray *)inFoldings level:(int)inLevel;
@@ -107,8 +82,6 @@ extern NSString * const BlockeditAttributeValue;
 - (NSStringEncoding)encoding;
 - (void)setEncoding:(NSStringEncoding)anEncoding;
 - (NSArray *)selectionOperationsForRangesUnconvertableToEncoding:(NSStringEncoding)encoding;
-
-
 @end
 
 @protocol FoldableTextStorageDelegate
@@ -130,8 +103,6 @@ extern NSString * const BlockeditAttributeValue;
 #pragma mark -
 
 @interface FoldableTextStorage (TextStorageScriptingAdditions)
-
-
 - (NSRange)rangeRepresentation;
 - (NSNumber *)scriptedLength;
 - (NSNumber *)scriptedStartCharacterIndex;
@@ -145,7 +116,4 @@ extern NSString * const BlockeditAttributeValue;
 //- (id)insertionPoints;
 //- (NSArray *)scriptedCharacters;
 //- (NSArray *)scriptedLines;
-
 @end
-
-//#endif