Support for Swift and Objective-C dependencies
This commit is contained in:
parent
4704cc427c
commit
ca4bb4a271
4 changed files with 141 additions and 0 deletions
18
tests/samples/codefiles/objective-c.m
Normal file
18
tests/samples/codefiles/objective-c.m
Normal file
|
@ -0,0 +1,18 @@
|
|||
//
|
||||
// Objective-C.m
|
||||
//
|
||||
|
||||
#import "SomeViewController.h"
|
||||
#import <UIKit.h>
|
||||
#import <PromiseKit/Something.h>
|
||||
|
||||
@interface ViewController : UIViewController
|
||||
@property (nonnull, strong) URL *url;
|
||||
@end
|
||||
|
||||
@implementation ViewController {
|
||||
- (void)viewDidLoad {
|
||||
[super viewDidLoad];
|
||||
// noop
|
||||
}
|
||||
@end
|
16
tests/samples/codefiles/swift.swift
Normal file
16
tests/samples/codefiles/swift.swift
Normal file
|
@ -0,0 +1,16 @@
|
|||
//
|
||||
// Swift.swift
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import UIKit
|
||||
import PromiseKit
|
||||
|
||||
class ViewController: UIViewController {
|
||||
|
||||
private var attribute: URL?
|
||||
|
||||
override func viewDidLoad() {
|
||||
// noop
|
||||
}
|
||||
}
|
|
@ -397,3 +397,26 @@ class DependenciesTestCase(TestCase):
|
|||
expected_lines=37,
|
||||
entity='typescript.ts',
|
||||
)
|
||||
|
||||
def test_swift_dependencies_detected(self):
|
||||
self.shared(
|
||||
expected_dependencies=[
|
||||
'UIKit',
|
||||
'PromiseKit',
|
||||
],
|
||||
expected_language='Swift',
|
||||
expected_lines=16,
|
||||
entity='swift.swift',
|
||||
)
|
||||
|
||||
def test_objective_c_dependencies_detected(self):
|
||||
self.shared(
|
||||
expected_dependencies=[
|
||||
'SomeViewController',
|
||||
'UIKit',
|
||||
'PromiseKit',
|
||||
],
|
||||
expected_language='Objective-C',
|
||||
expected_lines=18,
|
||||
entity='objective-c.m',
|
||||
)
|
||||
|
|
84
wakatime/dependencies/objective.py
Normal file
84
wakatime/dependencies/objective.py
Normal file
|
@ -0,0 +1,84 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
wakatime.dependencies.objective
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Parse dependencies from Objective-C and Swift code.
|
||||
|
||||
:copyright: (c) 2018 Alan Hamlett.
|
||||
:license: BSD, see LICENSE for more details.
|
||||
"""
|
||||
|
||||
import re
|
||||
|
||||
from . import TokenParser
|
||||
|
||||
|
||||
class SwiftParser(TokenParser):
|
||||
state = None
|
||||
exclude = [
|
||||
r'^foundation$',
|
||||
]
|
||||
|
||||
def parse(self):
|
||||
for index, token, content in self.tokens:
|
||||
self._process_token(token, content)
|
||||
return self.dependencies
|
||||
|
||||
def _process_token(self, token, content):
|
||||
if self.partial(token) == 'Declaration':
|
||||
self._process_declaration(token, content)
|
||||
elif self.partial(token) == 'Class':
|
||||
self._process_class(token, content)
|
||||
else:
|
||||
self._process_other(token, content)
|
||||
|
||||
def _process_declaration(self, token, content):
|
||||
if self.state is None:
|
||||
self.state = content
|
||||
|
||||
def _process_class(self, token, content):
|
||||
if self.state == 'import':
|
||||
self.append(content)
|
||||
self.state = None
|
||||
|
||||
def _process_other(self, token, content):
|
||||
pass
|
||||
|
||||
|
||||
class ObjectiveCParser(TokenParser):
|
||||
state = None
|
||||
extension = re.compile(r'\.[mh]$')
|
||||
|
||||
def parse(self):
|
||||
for index, token, content in self.tokens:
|
||||
self._process_token(token, content)
|
||||
return self.dependencies
|
||||
|
||||
def _process_token(self, token, content):
|
||||
if self.partial(token) == 'Preproc':
|
||||
self._process_preproc(token, content)
|
||||
else:
|
||||
self._process_other(token, content)
|
||||
|
||||
def _process_preproc(self, token, content):
|
||||
if self.state:
|
||||
self._process_import(token, content)
|
||||
|
||||
self.state = content
|
||||
|
||||
def _process_import(self, token, content):
|
||||
if self.state == '#' and content.startswith('import '):
|
||||
self.append(self._format(content))
|
||||
self.state = None
|
||||
|
||||
def _process_other(self, token, content):
|
||||
pass
|
||||
|
||||
def _format(self, content):
|
||||
content = content.strip().lstrip('import ').strip()
|
||||
content = content.strip('"').strip("'").strip()
|
||||
content = content.strip('<').strip('>').strip()
|
||||
content = content.split('/')[0]
|
||||
content = self.extension.sub('', content, count=1)
|
||||
return content
|
Loading…
Reference in a new issue